Merge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3
authorChristian Johansen <christian@gitorious.com>
Mon, 17 Dec 2012 13:07:55 +0000 (14:07 +0100)
committerChristian Johansen <christian@gitorious.com>
Mon, 17 Dec 2012 13:07:55 +0000 (14:07 +0100)
commit2eb33207b658bc4fd6e5d14a3d8d448ada914440
tree579804ff5787851e87a571847fada48df43f4235
parent26782356c6f205545eae61080ee8b0f1803c4d0a
parent01e1a7e1bb184ec804b9de915c04ef92c7faeaa5
Merge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3