Merge commit 'refs/merge-requests/1609' of gitorious.org:gitorious/mainline
authorJohan Sørensen <johan@johansorensen.com>
Mon, 5 Oct 2009 08:34:49 +0000 (10:34 +0200)
committerJohan Sørensen <johan@johansorensen.com>
Mon, 5 Oct 2009 08:34:49 +0000 (10:34 +0200)
commit565d23a6d3ad7e2a3093de85552306b7708a0e0a
treeaae7706f558bdf0616aaba1a58e5b47db2464b10
parent9c4c815f34dd8f880c9bfd6a2c2448098bf6b736
parentbd6e2945f31a9dee67bda147ba2995094f341562
Merge commit 'refs/merge-requests/1609' of gitorious.org:gitorious/mainline

* gitorious.org:gitorious/mainline:
  Redirecting to a separate pre activation message screen instead of just flashing a message when registering a user.
config/locales/en.rb
config/routes.rb