irungentoo 59f873fd68 Merge branch 'read-receipt' of https://github.com/stal888/ProjectTox-Core into pull-requests
Conflicts:
	testing/toxic/chat.c
	testing/toxic/prompt.c
2013-08-07 13:51:58 -04:00
..
2013-08-04 21:20:48 -04:00
2013-07-26 23:07:25 -04:00
2013-08-02 16:29:21 -04:00
2013-08-07 13:23:12 +02:00