Merge branch 'bug-860' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 31 Oct 2012 17:55:51 +0000 (18:55 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 31 Oct 2012 17:55:51 +0000 (18:55 +0100)
commit7baaa9a0ac611329539a43031ca3d0e81bba2b5f
treed8210f8004cc4efbcd73188e1eefe6277c7c21be
parent53b015bf6782b44e7c69f654734813a64da28a0e
parentd8f6a8160f62314dc94b9037089193d4ab295c9a
Merge branch 'bug-860' into release
includes/account.php
www/wot.php