Merge branch 'master_fixes' into 'master'

Marius Cramer

2014-10-13 43418672d32ee65ee6060314d4e66c3c44a8b0cb

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