James Booth 9aff8abd2e Merge branch 'master' into openpgp ...

Conflicts:
	.travis.yml

2015-06-05 23:02:56 +01:00

..

pgp

Moved pgp signature generation to cl_ev_presence_send

2015-05-08 00:07:21 +01:00