Merge remote-tracking branch 'origin/bug-1122' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 14 May 2013 23:24:47 +0000 (01:24 +0200)
committerMichael Tänzer <neo@nhng.de>
Tue, 14 May 2013 23:24:47 +0000 (01:24 +0200)
1  2 
includes/general.php

Simple merge