Merge commit 'refs/merge-requests/2206' of gitorious.org:gitorious/mainline into...
authorMarius Mathiesen <marius@gitorious.org>
Mon, 14 Feb 2011 14:06:35 +0000 (15:06 +0100)
committerMarius Mathiesen <marius@gitorious.org>
Mon, 14 Feb 2011 14:06:35 +0000 (15:06 +0100)
commit7e6cd92608cf977ef759d996c4049f1bdff33e6c
tree771a120ed9ceb9140f7adacb0c42e5de33acf951
parentd6a41e816d025dd33ec3909d96650f2ab08a81bc
parentc21a0c21129a48b25f3b656085689960d2892eed
Merge commit 'refs/merge-requests/2206' of gitorious.org:gitorious/mainline into merge-requests/2206