Merge remote-tracking branch 'florian030/master'

Marius Cramer

2014-04-10 58964a90d06f523f991a67bd1068e1f504d1f8a9

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