Merge remote-tracking branch 'origin/master' into janis_work
authorJanis Streib <janis@dogcraft.de>
Thu, 12 May 2016 22:47:37 +0000 (00:47 +0200)
committerJanis Streib <janis@dogcraft.de>
Thu, 12 May 2016 22:47:37 +0000 (00:47 +0200)
commit07f74d10bddc819f4524e2e0c1a2815eb4e7ec79
treec7e9b18099793f02ee6a2ad43a774ccc1c10bdae
parent63793f220fc6d84cf332df2c0e0416f096a4f007
parent8f19db917312590be3db9eabe91434d5750b5c15
Merge remote-tracking branch 'origin/master' into janis_work