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)
1  2 
includes/account.php
includes/general.php
www/gpg.php

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