fixes
fix
fix blocklist saving bug
Merge branch 'master' into debian/unstable
prepare for release

Signed-off-by: Kill Your TV <killyourtv@i2pmail.org>
small fix
Merge branch 'debian/unstable' into ubuntu/trusty
prepare for release

Signed-off-by: Kill Your TV <killyourtv@i2pmail.org>
correct return code check
Merge branch 'master' into debian/unstable
prepare for release

Signed-off-by: Kill Your TV <killyourtv@i2pmail.org>
Merge branch 'debian/unstable' into ubuntu/trusty
prepare for release

Signed-off-by: Kill Your TV <killyourtv@i2pmail.org>
implement word deletion via ^W
Merge branch 'master' into debian/unstable
prepare for release

Signed-off-by: Kill Your TV <killyourtv@i2pmail.org>
Merge branch 'debian/unstable' into ubuntu/trusty
prepare for release

Signed-off-by: Kill Your TV <killyourtv@i2pmail.org>
escape newlines in contact names/status messages
Merge branch 'master' into debian/unstable