Merge remote-tracking branch 'origin/bug-841' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 6 Sep 2011 15:23:19 +0000 (17:23 +0200)
committerMichael Tänzer <neo@nhng.de>
Tue, 6 Sep 2011 15:23:19 +0000 (17:23 +0200)
1  2 
includes/loggedin.php
www/index.php

Simple merge
diff --cc www/index.php
Simple merge