conversations-plus - improved conversations

	Commit message (Collapse)	Author	Age	Files	Lines
*	happy hanukkah	iNPUTmice	2014-11-16	1	-2/+8
\|
*	Merge branch 'master' into development	iNPUTmice	2014-11-16	1	-5/+18
\|\
\| *	close cursor for database	iNPUTmice	2014-11-16	1	-5/+18
\| \|
* \|	basic arbitrary file transfer	iNPUTmice	2014-11-15	1	-1/+6
\| \|
* \|	Move a chunk of classes over to using JID objects	Sam Whited	2014-11-09	1	-10/+12
\|/
*	Add last seen info to the database	Sam Whited	2014-11-04	1	-1/+8
\| \| \| \|	Fixes #612
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-0/+18
\| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+335