Merge branch 'maint'
commit17e73cf9496b9972e21c4024cd9719740c2b3e62
authorMarco Wahl <marcowahlsoft@gmail.com>
Sun, 2 Oct 2016 17:08:45 +0000 (2 19:08 +0200)
committerMarco Wahl <marcowahlsoft@gmail.com>
Sun, 2 Oct 2016 17:08:45 +0000 (2 19:08 +0200)
tree79234172e9bf8f829e3b3795193efca78c21449a
parent45c775a4d25fd5fa97871b9638d6205887606021
parent194e51e102597c5f831ca9dbef264ab3c02d18c8
Merge branch 'maint'