Sam Whited 46f147a82c Merge branch 'gradle' into development
Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib
2014-10-30 15:33:13 -04:00
..
2014-10-22 15:47:11 -04:00
2014-10-22 15:47:11 -04:00
2014-10-22 15:47:11 -04:00
2014-10-22 15:47:11 -04:00