Merge branch 'bug-1273' into release
authorBenny Baumann <BenBE@geshi.org>
Sun, 23 Nov 2014 14:02:56 +0000 (15:02 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sun, 23 Nov 2014 14:02:56 +0000 (15:02 +0100)
commit0bae20ba9f726c964eaee62a3b41c2da65bb8f0b
treef8d6b2f1f08845c98fea516d4005394fae9f3397
parent7d6bbbd7c52dab0393d2abe64839f00c69390c75
parentc2cc1c5e3f8f4b7ec9b786cffbb6f8ec68fcefc9
Merge branch 'bug-1273' into release
includes/account.php
includes/general.php
www/gpg.php