Merge branch 'bug-569' into release
authorBenny Baumann <BenBE@geshi.org>
Mon, 13 May 2013 17:56:34 +0000 (19:56 +0200)
committerBenny Baumann <BenBE@geshi.org>
Mon, 13 May 2013 17:56:34 +0000 (19:56 +0200)
1  2 
includes/account.php
www/wot.php

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