Merge branch 'next' of gitorious.org:gitorious/mainline into next
authorChristian Johansen <christian@gitorious.com>
Thu, 22 Aug 2013 10:26:33 +0000 (12:26 +0200)
committerChristian Johansen <christian@gitorious.com>
Thu, 22 Aug 2013 10:26:33 +0000 (12:26 +0200)
commit5a51e1c4619860fccce29edcb91eba74630d9139
tree0cb991c789b434b6f1feef64241133b13911ae63
parentf2d150788f64d03c3d63ad97db8947253e6bbe35
parent094c9f4f435bec14b4fb66ce6556dcde05cc56a2
Merge branch 'next' of gitorious.org:gitorious/mainline into next
Gemfile
Gemfile.lock