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)
commit12e0f5032caadb166eaa8a1cd1a5ea6136d662f2
treebbb3d19e5cc8bbec4060fc33d0fc1236677b70a6
parenta7b28f722eacc63fdb0b1e521962a9125a03ebdb
parent6887dac19180455ca325755d5d4e1087814cf374
Merge remote-tracking branch 'origin/bug-841' into release
includes/loggedin.php
www/index.php