Merge branch 'csr_challenge_password' into 'master'

Marius Cramer

2015-07-30 1271ad0e6995d021f5265365d1528709b3b9bb33

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