Merge branch 'release' into bug-1138
authorBenny Baumann <BenBE@geshi.org>
Wed, 30 Apr 2014 22:17:08 +0000 (00:17 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 30 Apr 2014 22:17:08 +0000 (00:17 +0200)
commita11cfcccaad26310d539c9dd70857d1eae72badd
tree73f3c8f268f69fc091e5b02d9aebba18cad00948
parent7e6053f91c8be4f2b2d1a6a3e93c62fbf8f8c156
parent24d8235f875f9ecff3198e3f0cf8d450beae1989
Merge branch 'release' into bug-1138
includes/account.php
includes/general.php
www/api/ccsr.php