Merge commit 'refs/merge-requests/188' of gitorious.org:gitorious/mainline
authorChristian Johansen <christian@gitorious.org>
Tue, 3 Jan 2012 07:46:57 +0000 (08:46 +0100)
committerChristian Johansen <christian@gitorious.org>
Tue, 3 Jan 2012 07:46:57 +0000 (08:46 +0100)
commit9e7e704a2a5f8d8acf20db05c9567d1fa180373f
tree134ba35ca7a565c001d69182e1d15c8256198763
parentd318738df998fd8f61572adb929cafb416991e03
parentbe7065c5b8cd7b14450ed5432fa0f9260534f424
Merge commit 'refs/merge-requests/188' of gitorious.org:gitorious/mainline