Merge branch 'release/2.4.0'
authorMarius Mathiesen <marius@gitorious.org>
Mon, 26 Nov 2012 12:01:59 +0000 (13:01 +0100)
committerMarius Mathiesen <marius@gitorious.org>
Mon, 26 Nov 2012 12:01:59 +0000 (13:01 +0100)
commit60554b1c7cb334636946825a192c8a75c77fe3f2
tree1044d9b3d589ffbb129c290f399e436cff733fdb
parentb4d2bc5c807213b75a79ca378fb96d1fe5219223
parent22dc9aa639b5f98b66fd3e85376879a94b5298de
Merge branch 'release/2.4.0'