Merge branch 'master' of git://gitorious.org/gitorious/mainline
authorMarius Mathiesen <marius.mathiesen@gmail.com>
Tue, 3 Feb 2009 08:16:38 +0000 (09:16 +0100)
committerMarius Mathiesen <marius.mathiesen@gmail.com>
Tue, 3 Feb 2009 08:16:38 +0000 (09:16 +0100)
commitdd2d7b456ddd04db21d6825a9b710b19653cf5b4
treee1f71b3a7bba3248ee7d371fdab33302f5da3f96
parent7d0c616a41650e60508c8ec672e5e49865a9f7ee
parent5a628175f2e3ac2fff11b4bd6660b7fa82adef27
Merge branch 'master' of git://gitorious.org/gitorious/mainline
config/locales/en.rb