Merge remote-tracking branch 'origin/bug-1318' into release
authorMichael Tänzer <neo@nhng.de>
Fri, 5 Dec 2014 00:11:53 +0000 (01:11 +0100)
committerMichael Tänzer <neo@nhng.de>
Fri, 5 Dec 2014 00:11:53 +0000 (01:11 +0100)
1  2 
includes/general.php

Simple merge