3 commits

Author	SHA1	Message	Date
iNPUTmice	1f378bffc8	made emoticon parsing enableable - default false	2014-09-03 09:15:07 +02:00
iNPUTmice	bda7724e31	improvements for merge conditions	2014-08-31 18:21:46 +02:00
iNPUTmice	1ac5be4855	some code cleanup	2014-08-31 16:28:21 +02:00