Merge branch 'next' of gitorious.org:gitorious/mainline into next
authorChristian Johansen <christian@gitorious.com>
Thu, 22 Aug 2013 08:25:15 +0000 (10:25 +0200)
committerChristian Johansen <christian@gitorious.com>
Thu, 22 Aug 2013 08:25:15 +0000 (10:25 +0200)
commitf2d150788f64d03c3d63ad97db8947253e6bbe35
tree3e767bef8ed1a720f4bc8e31c717f5316795746f
parent95a74c1c9a23a048e0df8d2acc0f8e1d2e9ac9b6
parent88121981bb7145b6f5cee7e4b9b91148467acc19
Merge branch 'next' of gitorious.org:gitorious/mainline into next
Gemfile
Gemfile.lock