Maxim Biro f669b28a6c Merge branch 'master' of http://github.com/irungentoo/ProjectTox-Core
Conflicts:
	core/Messenger.c
	core/Messenger.h
2013-08-07 19:18:40 -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