Merge branch '2.0'
authorMatthias Schmidt <gravatronics@live.com>
Sun, 18 Sep 2016 08:06:26 +0000 (10:06 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 18 Sep 2016 08:06:26 +0000 (10:06 +0200)
commit75f097f2166d578e233a6741f4691301feb05418
tree6330b1d3a55de483c1a68abf62de56fd790242e1
parent588e201d5c93f8c581f046f4d9ceed8923589bea
parentd5e51b5f25c9f5c08e768130acebead04ba1aa52
Merge branch '2.0'