Merge branch 'master' into justin/erbium
authorMirio <opivy@hotmail.de>
Mon, 31 Aug 2015 11:59:56 +0000 (13:59 +0200)
committerMirio <opivy@hotmail.de>
Mon, 31 Aug 2015 11:59:56 +0000 (13:59 +0200)
commite152106a22e90e62fac1e5e03ddf1423c1fde169
tree5ff703b4af22df76f49596d279aa653065864f07
parentd380dbe9506bfa907ebc5c14f25a823fd4fda0dc
parentb9cc27af323228bc65160dbbddb031739909ac58
Merge branch 'master' into justin/erbium