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)
commit61b7932e82383f03cf751ff246c0610ce30dfd20
tree0ca86900624f4fc949a52388c7e16d36a2ff2684
parentf024a4992a9a38d64d0fd63283cd0c484bdec683
parent86bdf6e1d4539da1076afe10b57b177fb54dd147
Merge branch 'bug165-005-NETWORK' of git://arthur.barton.de/ngircd-alex

* 'bug165-005-NETWORK' of git://arthur.barton.de/ngircd-alex:
  Implement new configuration option "Network"