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