Merge branch 'toktok' of git.z3bra.org:ratox into toktok - ratox

commit f9d05d12f01ff12b4200f9ee9e6b19c9704765c5
parent 41f7619d0241d5e673138d7adc3badece42b7d2f
Author: pranomostro <pranomestro@gmail.com>
Date:   Thu, 29 Dec 2016 15:47:59 +0100

Merge branch 'toktok' of git.z3bra.org:ratox into toktok

	ratox FIFO based tox client
	git clone git://git.2f30.org/ratox
	Log \| Files \| Refs \| README \| LICENSE