Merge commit 'refs/merge-requests/205' of gitorious.org:gitorious/mainline
authorMarius Mathiesen <marius@gitorious.org>
Fri, 1 Jun 2012 07:45:20 +0000 (09:45 +0200)
committerMarius Mathiesen <marius@gitorious.org>
Fri, 1 Jun 2012 07:45:20 +0000 (09:45 +0200)
commitbdc8715eaf37ddb3ffe6725029c664b7b3cb478b
tree37076a217b8baaa52f65009ff2d912a4ec3a8cac
parent4b4dc69b69aa7a61c36aaf1f95a8c9ea23e0eba5
parent2c1787029265403f25374a5dfc58582c5bd49205
Merge commit 'refs/merge-requests/205' of gitorious.org:gitorious/mainline