Merge branch 'maint'
commitd6474520899df70920f4b69a4437d273ccf6b5f4
authorSven Verdoolaege <skimo@kotnet.org>
Thu, 17 Apr 2014 21:08:52 +0000 (17 23:08 +0200)
committerSven Verdoolaege <skimo@kotnet.org>
Thu, 17 Apr 2014 21:08:52 +0000 (17 23:08 +0200)
treef4c1113a032376c607f657e624e651ec0a24d648
parent6340a4f7d0db95e002bcc39869da16c890a7d3a9
parentfecc782165ba2e0fa5347659b38e44e858d38c22
Merge branch 'maint'