Merge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3
authorChristian Johansen <christian@gitorious.com>
Thu, 6 Dec 2012 15:25:42 +0000 (16:25 +0100)
committerChristian Johansen <christian@gitorious.com>
Thu, 6 Dec 2012 15:25:42 +0000 (16:25 +0100)
commitdadf871ecece164b84d6021e689ef2d1e7efece4
tree4831446a6933933acd51e4e62010b6ef2f9a0d73
parent6c19622142ecc58006d3f46633e3d1cbedb917f1
parent72ea71e7362b938f3ae760e9a76ecd0a84a9a9cf
Merge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3