Merge branch 'bug-978' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 31 Oct 2012 17:21:00 +0000 (18:21 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 31 Oct 2012 17:21:00 +0000 (18:21 +0100)
commite74bad9bcc62cbc3aea8bfc4aba8f656d7a80bcb
tree9e8480c6770f57071dcfe3eea04fc8795cd89b01
parent8c1b4680b35b6d07b9c9459df9cbcd439be4b7ea
parent82c2ea4c8a8338ced01e22989dffc1fffb13e3f9
Merge branch 'bug-978' into release

Signed-off-by: Benny Baumann <BenBE@geshi.org>
includes/account.php
includes/account_stuff.php