Merge branch 'master' into emergency
authorMark Wooding <mdw@distorted.org.uk>
Thu, 8 Mar 2012 18:57:42 +0000 (18:57 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Thu, 8 Mar 2012 18:57:42 +0000 (18:57 +0000)
* master:
  classify.m4: Reject the RFC5737 documentation-only addresses.


Trivial merge