Merge commit 'refs/merge-requests/1610' of git://gitorious.org/gitorious/mainline
authorMarius Mathiesen <marius@shortcut.no>
Thu, 15 Oct 2009 08:19:59 +0000 (10:19 +0200)
committerMarius Mathiesen <marius@shortcut.no>
Thu, 15 Oct 2009 08:19:59 +0000 (10:19 +0200)
commit9f8988070c662e512035b50c86d9ef65ad0d8fc4
tree4bcf48dd11ea86aa0c1f232f77ba1f96684f2e56
parent4c28a870e844842df597cc274c67a9300dbf33cc
parent6c4ffccf288035057359783537124e229abef694
Merge commit 'refs/merge-requests/1610' of git://gitorious.org/gitorious/mainline
config/environment.rb