Merge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3
authorChristian Johansen <christian@gitorious.com>
Wed, 21 Nov 2012 09:27:24 +0000 (10:27 +0100)
committerChristian Johansen <christian@gitorious.com>
Wed, 21 Nov 2012 09:27:24 +0000 (10:27 +0100)
commit10012423f3605d8bdccbf694b5c8a0a75da5b8ad
tree921a25cf91aa2fe623b91ecf152bb43d15177e68
parent8780dbd2f94ff32375da45366e3eea82ef9d0596
parentfd1765989eeb5dac6f8a41692b692815fa0bb0c8
Merge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3