Merge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3
authorChristian Johansen <christian@gitorious.com>
Wed, 5 Dec 2012 13:03:00 +0000 (14:03 +0100)
committerChristian Johansen <christian@gitorious.com>
Wed, 5 Dec 2012 13:03:00 +0000 (14:03 +0100)
commit6b1533119efc91c86a6ead01ee524981daf40f3a
treea0f9a8415095c1c6914d49fd746740006da159c4
parent4d6c3b5ee6e8253f31f16b7fbc4c6e752983424b
parent3e69cdf045614065a6843589f797b3773bfe72e4
Merge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3