Merge commit 'refs/merge-requests/2205' of gitorious.org:gitorious/mainline
authorMarius Mathiesen <marius@gitorious.org>
Mon, 14 Feb 2011 14:25:59 +0000 (15:25 +0100)
committerMarius Mathiesen <marius@gitorious.org>
Mon, 14 Feb 2011 14:25:59 +0000 (15:25 +0100)
commitc6202c67311e6ff183d80da607b263e526430f14
tree9c59903cc87cfa28130ee80716174f467944ed31
parent2ebf1316b8f5cfe0083f96e5c3c3efc5ea4963b8
parentea4e9f77ef9c9fba49577f4a50aba29acdf29bc2
Merge commit 'refs/merge-requests/2205' of gitorious.org:gitorious/mainline
app/controllers/application_controller.rb
doc/recipes/install-ubuntu.sh