Merge commit 'refs/merge-requests/189' of gitorious.org:gitorious/mainline
authorChristian Johansen <christian@gitorious.org>
Tue, 3 Jan 2012 07:49:20 +0000 (08:49 +0100)
committerChristian Johansen <christian@gitorious.org>
Tue, 3 Jan 2012 07:49:20 +0000 (08:49 +0100)
commit3558055eed834a735d096c604821a4fe32a3baef
tree7edcb1bb0d784012bccb68881d8425d5f1b6eab8
parent9e7e704a2a5f8d8acf20db05c9567d1fa180373f
parent6319abe726adffe510e77860c32f5a34f68e04bb
Merge commit 'refs/merge-requests/189' of gitorious.org:gitorious/mainline