Merge commit 'refs/merge-requests/207' of gitorious.org:gitorious/mainline into merge...
authorThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Thu, 27 Sep 2012 17:26:07 +0000 (19:26 +0200)
committerThomas Kjeldahl Nilsson <thomas@kjeldahlnilsson.net>
Thu, 27 Sep 2012 17:26:07 +0000 (19:26 +0200)
commit4954ddf342d4735b4f1aca55eb7404ad9f3724ef
treec10134ad5473ce364e06f4f68b97da7574667917
parent056310eef04d19a8a28b54f149170c3b95111994
parent1405b577b90fa2f08ef4148caceebb710f54404b
Merge commit 'refs/merge-requests/207' of gitorious.org:gitorious/mainline into merge-requests/207

Conflicts:
config/gitorious.sample.yml
config/gitorious.sample.yml