Merge branch 'host-port' into next

* host-port:
  irkerd: Add command-line options for the listener --host and --port

diff --cc NEWS
index 672259b5bfb3d3de9f229c8d742c962dec6b69b1,352947cb0070e74571dada103f36743b880c6185..a9c9b770df66cb52e95f57b111f98c2de4abebd5
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,7 -1,7 +1,8 @@@
                        irker history 
  
  2.8 @ unreleased
 +  Add support for --syslog.
+   Add support for --host and --port.
  
  2.7 @ 2014-03-15
    Add support for ircs:// and SSL/TLS connections to IRC servers.

diff --cc irkerd
Simple merge

diff --cc irkerd.xml
index f6cf2771ba5b470fc1660714df5474ab5bcc6b9a,b05202b07815d6a871ebbc21f540767196133961..5cd96f7a39ee501cc85c1b78c1a35e533a975c81
--- 1/irkerd.xml
--- 2/irkerd.xml
+++ b/irkerd.xml
@@@ -20,8 -20,9 +20,10 @@@
    <command>irkerd</command>
       <arg>-c <replaceable>ca-file</replaceable></arg>
       <arg>-d <replaceable>debuglevel</replaceable></arg>
 +     <arg>--syslog</arg>
       <arg>-l <replaceable>logfile</replaceable></arg>
+      <arg>-H <replaceable>host</replaceable></arg>
+      <arg>-P <replaceable>port</replaceable></arg>
       <arg>-n <replaceable>nick</replaceable></arg>
       <arg>-p <replaceable>password</replaceable></arg>
       <arg>-i <replaceable>IRC-URL</replaceable></arg>