Merge branch 'master' into 'master'

Marius Cramer

2015-10-23 3ff9d214bf9f34c1ffc5f40227119eb44693363d

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