Merge branch 'bash' into 'master'

Marius Cramer

2015-06-05 1fa1bcead3a1fc02c1ff81732ce0e561df64822b

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