Merge commit 'refs/merge-requests/176' of gitorious.org:gitorious/mainline
authorChristian Johansen <christian@gitorious.org>
Fri, 14 Oct 2011 10:25:04 +0000 (12:25 +0200)
committerChristian Johansen <christian@gitorious.org>
Fri, 14 Oct 2011 10:25:04 +0000 (12:25 +0200)
commit7823de7f6c0844a5164d868127fe79df65a10b2b
tree774081825fcabf559fbbec6c4dadb0bd33bbbf92
parent25413c879192ca49449bd5bdf4624b6ff6973dd1
parentacfefc11041596c3c7236da5bb58ad5e09c86dcd
Merge commit 'refs/merge-requests/176' of gitorious.org:gitorious/mainline