Merge commit 'refs/merge-requests/2224' of gitorious.org:gitorious/mainline
authorMarius Mathiesen <marius@gitorious.org>
Thu, 7 Apr 2011 13:12:28 +0000 (15:12 +0200)
committerMarius Mathiesen <marius@gitorious.org>
Thu, 7 Apr 2011 13:12:28 +0000 (15:12 +0200)
commit1a72220ecf80b8df34217220a6a68121df4f19ec
tree4f0669a3cb18b0e885f6845bae0ada757d0efbe9
parent0352f5a937c4a810c2638b747fe0b6bcfda33e73
parent62da26c6fbd48f9e557d6729598e450f2aafa6f2
Merge commit 'refs/merge-requests/2224' of gitorious.org:gitorious/mainline