Merge branch '1.0'
authorMilian Wolff <mail@milianw.de>
Tue, 21 Feb 2017 08:42:31 +0000 (09:42 +0100)
committerMilian Wolff <mail@milianw.de>
Tue, 21 Feb 2017 08:42:31 +0000 (09:42 +0100)
commit7d1098c124c5033e28b2e8f6b94e955d1d873fa6
tree975cd7e813aedc2bb91b7ceb86ca82b412efaa6e
parent08bdda7b322c97566c7de81fc95b012af9a0bd29
parentdca3b138cd2d3d091f588528cfee38a78d91b4b2
Merge branch '1.0'