Merge branch 'greylist_filter' into 'master'

Marius Cramer

2015-02-03 c7397a27fa9fde20a82ad98efd721308a0c968d1

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