Merge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3
authorMarius Mathiesen <marius@gitorious.org>
Wed, 21 Nov 2012 12:30:16 +0000 (13:30 +0100)
committerMarius Mathiesen <marius@gitorious.org>
Wed, 21 Nov 2012 12:30:16 +0000 (13:30 +0100)
commitf60a9224779fa7dffcf3c1eb1e6aa6d869e90f67
treea22b39983152144e5c75f95808d2ca3d04185901
parent176a9e6bd42c98c000ba1d4232264b1e2277d6c9
parent05f26d492162906ac30d2c2976bb0d33cdef9cf0
Merge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3