Merge branch 'bug-1192' into release
authorBenny Baumann <BenBE@geshi.org>
Sun, 23 Nov 2014 14:02:16 +0000 (15:02 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sun, 23 Nov 2014 14:02:16 +0000 (15:02 +0100)
commit7d6bbbd7c52dab0393d2abe64839f00c69390c75
tree3d58601a565e1a06f6e712e1eec98e42dd205545
parentce9b70c7ed7224185f467ac1bd955af7b9bb28cc
parent58d2ce2b4829bb3869f7fd9c361358596c2a709e
Merge branch 'bug-1192' into release
includes/loggedin.php
www/index.php