Merge branch 'u2_10_12_branch' of git://git.code.sf.net/p/undernet-ircu/ircu2
authorpk910 <philipp@zoelle1.de>
Sat, 7 Nov 2015 23:04:09 +0000 (00:04 +0100)
committerpk910 <philipp@zoelle1.de>
Sat, 7 Nov 2015 23:04:09 +0000 (00:04 +0100)

Trivial merge