Merge branch 'release/2.4.0' into next
authorMarius Mathiesen <marius@gitorious.org>
Mon, 26 Nov 2012 12:02:04 +0000 (13:02 +0100)
committerMarius Mathiesen <marius@gitorious.org>
Mon, 26 Nov 2012 12:02:04 +0000 (13:02 +0100)
commit7d5f9442afebc3436c9c1759ad3b2a6042b91ad4
tree1044d9b3d589ffbb129c290f399e436cff733fdb
parent77c147f220e90a37bf71abf2aefd90b1498f939d
parent22dc9aa639b5f98b66fd3e85376879a94b5298de
Merge branch 'release/2.4.0' into next