Merge branch 'next' of gitorious.org:gitorious/mainline into next
authorMarius Mathiesen <marius@gitorious.org>
Thu, 19 Sep 2013 14:09:13 +0000 (16:09 +0200)
committerMarius Mathiesen <marius@gitorious.org>
Thu, 19 Sep 2013 14:09:13 +0000 (16:09 +0200)
commit8c56a12a1348211317281b1156a44acc172d9685
treeb6a064745c665286ae2900ccf6b05e3bce0988d5
parent2bcb4dc5de0a6edffaab2c674a43769477ea1d09
parent203ef5ed04e9b78fb8c5571d4c4d483b181df926
Merge branch 'next' of gitorious.org:gitorious/mainline into next