Merge branch 'master' of github.com:clamiax/circo - circo

commit b9512169bb39a792c197e33c504666dbdc8ca8ce
parent 5597fee92d7afc91efc414aaa9c8dc0698100c61
Author: Claudio Alessi <smoppy@gmail.com>
Date:   Fri, 14 Jul 2017 21:23:15 +0200

Merge branch 'master' of github.com:clamiax/circo

	circo claudio's IRC oasis
	git clone git://git.bitsmanent.org/circo
	Log \| Files \| Refs \| README \| LICENSE