Merge commit 'refs/merge-requests/204' of gitorious.org:gitorious/mainline
authorMarius Mathiesen <marius@gitorious.org>
Tue, 10 Jul 2012 06:51:04 +0000 (08:51 +0200)
committerMarius Mathiesen <marius@gitorious.org>
Tue, 10 Jul 2012 06:51:04 +0000 (08:51 +0200)
commite41a5d0b0d640dc1b16dd104b525573c371c8882
tree9090894e16a6caf159a6745a1a0ed5554f992cfc
parentbefd9ff9fdced6a7f55bc49824cb4f0067d3763b
parent4e46aa2992afe3010ace20505ac2f1eb01ef9b49
Merge commit 'refs/merge-requests/204' of gitorious.org:gitorious/mainline