Merge commit 'refs/merge-requests/2241' of gitorious.org:gitorious/mainline
authorChristian Johansen <christian@gitorious.org>
Tue, 28 Feb 2012 06:53:13 +0000 (07:53 +0100)
committerChristian Johansen <christian@gitorious.org>
Tue, 28 Feb 2012 06:53:13 +0000 (07:53 +0100)
commit5658757be965871acf57f2caf205f1c4c9f20fd1
treed4e99204690442ecc0e45502670f62302bdf6f14
parentd0f40a6311c6a940b1393016aa9ad36494769455
parent54f44367c7e7d6040ae15fec31d5275566ea12fa
Merge commit 'refs/merge-requests/2241' of gitorious.org:gitorious/mainline