Merge commit 'refs/merge-requests/2236' of gitorious.org:gitorious/mainline
authorChristian Johansen <christian@gitorious.org>
Tue, 28 Feb 2012 06:50:10 +0000 (07:50 +0100)
committerChristian Johansen <christian@gitorious.org>
Tue, 28 Feb 2012 06:50:10 +0000 (07:50 +0100)
commitd0f40a6311c6a940b1393016aa9ad36494769455
tree594a61297169c24df5301f31835a8e05ea083390
parent9257de22dcee426b119fc1938dbd5fd8ba95ca88
parent7e5c1b98474c1ac6e18351b53c66cdd8d7c0235c
Merge commit 'refs/merge-requests/2236' of gitorious.org:gitorious/mainline