Merge branch 'maint'
commit986475a699bffacd25e797b0fcf549fabef92538
authorMarco Wahl <marcowahlsoft@gmail.com>
Wed, 16 Dec 2015 07:41:19 +0000 (16 08:41 +0100)
committerMarco Wahl <marcowahlsoft@gmail.com>
Wed, 16 Dec 2015 07:41:19 +0000 (16 08:41 +0100)
treec7f0e12369f6701bb55edfd1daa698283c8a89e1
parent0bdf4cedc5959ec4f40eb3b79302f020d69e2fd0
parent5761580defe87e27d6fb131229ebb63909aa03e4
Merge branch 'maint'