Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/zone
authorMark Wooding <mdw@distorted.org.uk>
Fri, 25 Apr 2014 21:37:17 +0000 (22:37 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 25 Apr 2014 21:37:17 +0000 (22:37 +0100)
* 'master' of git.distorted.org.uk:~mdw/publish/public-git/zone:
  addr-family-ipv6.lisp (ipaddr-string): Ignore trivial runs of zeros.
  addr-family-ipv6.lisp (ipaddr-string): Use IPv4 notation if appropriate.
  addr-family-ipv6.lisp (ipaddr-string): Upend the conditional.


Trivial merge