Merge branch 'bug165-005-NETWORK' of git://arthur.barton.de/ngircd-alex
authorAlexander Barton <alex@barton.de>
Wed, 1 Jan 2014 23:44:42 +0000 (00:44 +0100)
committerAlexander Barton <alex@barton.de>
Wed, 1 Jan 2014 23:44:42 +0000 (00:44 +0100)
* 'bug165-005-NETWORK' of git://arthur.barton.de/ngircd-alex:
  Implement new configuration option "Network"


Trivial merge