Merge branch 'master_fixes' into 'master'

Marius Cramer

2014-02-26 bdc27bfea618952447ef7facab838df5741f1ec3

1
ALTER TABLE `client_template` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1';