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

Simple merge
Simple merge
Simple merge