conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-12	2	-9/+22
*	Fixes FS#139: Do not merge messages at all	steckbrief	2016-03-11	2	-106/+3
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-08	5	-36/+118
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-06	12	-543/+1166
*	Moved logcat to a module, increased error robustness for loading last messages	steckbrief	2015-12-10	1	-2/+1
*	Implements FS#67: Introduce central logging class to use log prefix, new acti...	steckbrief	2015-11-20	1	-11/+11
*	Access to preferences moved to global utility class ConversationsPlusPreferen...	steckbrief	2015-10-21	1	-1/+2
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-16	4	-29/+51
*	resolve of some compiler errors	lookshe	2015-08-13	1	-1/+1
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-11	11	-218/+328
*	Status color added to "create conversation" (refers to ticket #22 in flyspray)	steckbrief	2015-06-19	3	-0/+15
*	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	14	-0/+3447