Merge branch 'reseller_template_limits' into 'master'

Marius Cramer

2014-07-08 5d1c691970d8e30d4ab6e3ba9efcec98f858b1fc

1
ALTER TABLE `shell_user` CHANGE `ssh_rsa` `ssh_rsa` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;