Merge branch 'master' into sev/luma
authorSeverin Meyer <sev.ch@web.de>
Fri, 2 Jan 2015 09:47:07 +0000 (10:47 +0100)
committerSeverin Meyer <sev.ch@web.de>
Fri, 2 Jan 2015 09:47:07 +0000 (10:47 +0100)
commit2ff5923b5d3acdd9ed21ee37481c69586a6a7bf4
tree82292dc2c3a945d7fea7bf2d74ff37bd22066ec5
parentb38238f0aaa46ac8e8fa348f1be57e5ec054bed3
parentfd1db0751352e8b2428a07557caa80ce6c913509
Merge branch 'master' into sev/luma