Merge branch 'bug-569' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 16 Oct 2013 15:36:55 +0000 (17:36 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 16 Oct 2013 15:36:55 +0000 (17:36 +0200)
commit7385b4579b057cc56a2c8eb6c287e765cdbca42e
tree3fc28930d0c215a0bf0e7a8832d7dbbf63269119
parent8947e9bec9c0b39a62fb852f3e87702cfadb9211
parent68056545c7f7d1bd210c05b3034436a984b0d7ff
Merge branch 'bug-569' into release
includes/account.php