fix merge errors
authortobiasKaminsky <tobias@kaminsky.me>
Fri, 13 Nov 2015 16:54:25 +0000 (17:54 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Fri, 13 Nov 2015 16:54:25 +0000 (17:54 +0100)

No differences found