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)
commit5caa9a42c1968d16a315fafc95297e2338804895
tree2153d26a43c089d67efa7e9523ea7424826d18c5
parent9ae82479e1118750d3d6a20881f612c9bd2cc426
parent677ef44ed3d745abddbb192ca4d53778819ffe6c
Merge branch 'master' into emergency

* master:
  classify.m4: Reject the RFC5737 documentation-only addresses.