Merge branch 'hotfix/2.4.1'
authorMarius Mathiesen <marius@gitorious.org>
Mon, 26 Nov 2012 16:09:32 +0000 (17:09 +0100)
committerMarius Mathiesen <marius@gitorious.org>
Mon, 26 Nov 2012 16:09:32 +0000 (17:09 +0100)
commitc58478f94a597d86b00a677d2250c6a65bb289e0
treebff288ac782e07d312507b22e997dcc86cc00b44
parent60554b1c7cb334636946825a192c8a75c77fe3f2
parent8abcc2d0f42d3a5354816748bad0e16a08262f48
Merge branch 'hotfix/2.4.1'