Merge branch 'master'
authormarkus schnalke <meillo@marmaro.de>
Fri, 23 Oct 2015 12:26:49 +0000 (14:26 +0200)
committermarkus schnalke <meillo@marmaro.de>
Fri, 23 Oct 2015 12:26:49 +0000 (14:26 +0200)
commit9c61a657f72aa43b4a2f4e027ad84e7f65fb66cb
tree59a225354bbb3e71d366c89466be2c9ca409f625
parentb4987f510fb3494bfc5b11fc92d2047cdb51642b
parent64821c40d50284022f9eda4ade8dbd1a77c189a9
Merge branch 'master'