Sebastian Kaspari 60f4412096 Merge branch 'master' into optimization ... Conflicts: src/org/yaaic/activity/ConversationActivity.java src/org/yaaic/irc/IRCService.java		2010-03-29 22:04:38 +02:00
..
ConversationReceiver.java	Merge branch 'master' into optimization	2010-03-29 22:04:38 +02:00
ServerReceiver.java	Some more documentation	2010-03-13 16:54:48 +01:00