2 commits

Author	SHA1	Message	Date
iNPUTmice	cc4f3702a8	made file transfers cancelable	2014-11-15 15:34:12 +01:00
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