Merge branch 'maint'
authorSven Verdoolaege <skimo@kotnet.org>
Thu, 1 May 2014 11:06:36 +0000 (13:06 +0200)
committerSven Verdoolaege <skimo@kotnet.org>
Thu, 1 May 2014 11:06:36 +0000 (13:06 +0200)
commitac510e17f63ed6647157f46a3c2830626efd146d
treeb851a2a1bc55724b62b0ac4291b3f4ae85bbcf3a
parentb86d6d741163fa51a0c27a16ad467ae901a672bd
parent665eaee653bc15f6d9923d41b4f53aa0517235f3
Merge branch 'maint'