Merge branch 'u2_10_12_branch' of git://git.code.sf.net/p/undernet-ircu/ircu2