Merge branch 'csr_challenge_password' into 'master'

Marius Cramer

2015-07-30 1271ad0e6995d021f5265365d1528709b3b9bb33

1
2
3
 
-- increase column size
ALTER TABLE `client` CHANGE `template_additional` `template_additional` TEXT NOT NULL;