Merge branch '1.0'
authorMilian Wolff <mail@milianw.de>
Sun, 26 Feb 2017 20:35:54 +0000 (21:35 +0100)
committerMilian Wolff <mail@milianw.de>
Sun, 26 Feb 2017 20:35:54 +0000 (21:35 +0100)
commit3a34d54697e29428354309596e6db07ff4ec923d
tree100890a398e9c13572613a8d22a54b7d123b3038
parent7fe121258f710a2e85f342a54d65db2bccf8e4e9
parentb77cd26eaa1b59eadb652455cc2322f503c0b680
Merge branch '1.0'