Merge commit 'refs/merge-requests/162' of gitorious.org:gitorious/mainline into featu...
authorChristian Johansen <christian@gitorious.org>
Thu, 1 Sep 2011 11:28:00 +0000 (13:28 +0200)
committerChristian Johansen <christian@gitorious.org>
Thu, 1 Sep 2011 11:28:00 +0000 (13:28 +0200)
commita348a1f2e209a17a5a8aee11f1f2e01f1e29d679
tree23ff5dcdb0bfe82ef6c809d16c00db89e7c3d6f0
parentb250707b5b883172f62021181f66d51c92377c62
parent7d91aac2c154b64fce2f52668fa82f76b604216e
Merge commit 'refs/merge-requests/162' of gitorious.org:gitorious/mainline into features/annotations