fix groupchat issue
Merge pull request #373 from dubslow/master

fix groupchat issue
Merge branch 'master' into debian/unstable

Signed-off-by: Kill Your TV <killyourtv@i2pmail.org>
prepare for release

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

Signed-off-by: Kill Your TV <killyourtv@i2pmail.org>

Conflicts:
	debian/changelog
prepare for release

Signed-off-by: Kill Your TV <killyourtv@i2pmail.org>