Merge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3
authorChristian Johansen <christian@gitorious.com>
Fri, 16 Nov 2012 22:54:29 +0000 (23:54 +0100)
committerChristian Johansen <christian@gitorious.com>
Fri, 16 Nov 2012 22:54:29 +0000 (23:54 +0100)
commitec8471a46197b73947d094ecbe998a8e6a04ebc2
tree9eb6a521a167a81ee1061f3e65b244b3686e09e4
parentd9fa86002feeffffa1fa02a437cbfd184487edc9
parent049baf2718a8bc4930e454fc4a29fe3108bcefbe
Merge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3