Merge remote-tracking branch 'akretz/master'
authorPhilipp Hagemeister <phihag@phihag.de>
Thu, 11 Dec 2014 15:35:45 +0000 (16:35 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Thu, 11 Dec 2014 15:35:45 +0000 (16:35 +0100)
commitcf68bcaeff77f5a5784c7c5473ce4fea0b8c73ae
treef0814151a6174723d04ac15b85327f78a71b1925
parentcbe2bd914d65fc717d31034234102cd25c7f7313
parent8560c618422214745caa4766292afa9c0d3f35c2
Merge remote-tracking branch 'akretz/master'