ok i got things straight
Merge branch 'master' of https://github.com/atlas7/InspIRCd-anon

Conflicts:
	src/modules/m_spanningtree/uid.cpp
Merge branch 'master' of https://github.com/atlas7/InspIRCd-anon
hm