Merge commit 'refs/merge-requests/175' of git://gitorious.org/gitorious/mainline
authorChristian Johansen <christian@gitorious.org>
Wed, 5 Oct 2011 12:13:00 +0000 (14:13 +0200)
committerChristian Johansen <christian@gitorious.org>
Wed, 5 Oct 2011 12:13:00 +0000 (14:13 +0200)
commit90dfef22f8393fca8c573fb59010227e5b606c47
treeadcb0bd57a714fd2b951c445acfa5471ca2abae7
parentfbe37d79e040cc80ad1e08fe1ce9d07b927c5f22
parent6fb12e922f32e578096d5bdebfe6aa4516ca62e0
Merge commit 'refs/merge-requests/175' of git://gitorious.org/gitorious/mainline