Merge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3
authorChristian Johansen <christian@gitorious.com>
Tue, 20 Nov 2012 12:26:56 +0000 (13:26 +0100)
committerChristian Johansen <christian@gitorious.com>
Tue, 20 Nov 2012 12:26:56 +0000 (13:26 +0100)
commit0fc5b89e5c2c61f490426daec91b82404c436123
treed8287d9e6598b95af8f28ad673563bcd78b7f761
parentca8b039a3ca8ddb3803f83b17d745b596488cc8a
parente127a08a8878db7d11c2466968d6f31e03527014
Merge branch 'feature/rails3' of gitorious.org:gitorious/mainline into feature/rails3