conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge tag '1.6.3' into trz/rebasetrz/merge_1.6.3	lookshe	2015-08-24	1	-36/+58
\|\
\| *	put wake locks on out of band file transfers	Daniel Gultsch	2015-08-10	1	-0/+4
\| *	provide more detailed error toasts for http file download	Daniel Gultsch	2015-08-10	1	-37/+58
\| *	enable axolotl encryption for jingle supported file transfers	Daniel Gultsch	2015-08-01	1	-17/+8
\| *	use gcm for file encryption over http	Daniel Gultsch	2015-07-29	1	-5/+16
\| *	use 'interactive mode' when starting downloads from the context menu	Daniel Gultsch	2015-07-22	1	-1/+0
\| *	rely on refreshUi/refreshUiReal and make sure it is being used everywhere	Daniel Gultsch	2015-07-20	1	-4/+1
\| *	Optimize imports	Andreas Straub	2015-07-20	1	-1/+1
\| *	Encrypt files for HTTP upload in encrypted chats	Andreas Straub	2015-07-19	1	-2/+4
\| *	fixed inactive http download	Daniel Gultsch	2015-07-17	1	-1/+1
\| *	renamed HttpConnection to HttpDownloadConnection	Daniel Gultsch	2015-07-10	1	-0/+269
*	fixes FS#44 - IOException if content-length is not present	lookshe	2015-08-21	1	-3/+3
*	Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1	lookshe	2015-08-11	1	-0/+269