Merge branch 'unlimited_clients' into 'master'

Marius Cramer

2014-07-04 80e18c2c0e2e08e1c4ffb792b731451835cf01d4

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