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

Conflicts:
	.travis.yml

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

..

stub_accounts.c

Merge branch 'master' into openpgp

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