Merge branch 'next' of gitorious.org:gitorious/mainline into next
authorChristian Johansen <christian@gitorious.com>
Fri, 12 Jul 2013 12:09:19 +0000 (14:09 +0200)
committerChristian Johansen <christian@gitorious.com>
Fri, 12 Jul 2013 12:09:19 +0000 (14:09 +0200)
commitb7e2dfb1ed80ae3d0f5c81531be00df5fdbdbca0
tree6d6d94a65499c119c6e1e1c76f07c03d069ce0b0
parent9b6b3a42541ae20b5b30464c9b92285e6210d5b8
parentf748cb4851f786ffb12d3eea327fefd17aeba291
Merge branch 'next' of gitorious.org:gitorious/mainline into next
Gemfile