Merge branch 'master_fixes' into 'master'

Marius Cramer

2014-10-14 466f06a5845e57661092392055999cc0895af5f8

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