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)
commitcce4cb6f46d73b304cc83b3a4202359a521f4c6e
tree04972da1337ac9f28109214888525e2c6f37b578
parentd667474cb21d5258524d8a1f8f36e61df6c5af0b
parentdc7e1e0762461b0abbcf1854bd17829fb1ea833b
Merge branch 'bug-569' into release
includes/account.php
www/wot.php