Merge remote-tracking branch 'ispc/master' into new-layout-3.1

Marius Cramer

2014-12-19 62e25488daa4f857f717d2687e820091ffaa8a13

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