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)
1  2 
includes/account.php
www/wot.php

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