tree f9dbe477dce429eaf3e8f805460106a3dcf99c9c
parent f0bec73b018caa07d3e75ec8dd967f3785d71bde
parent a1bc009dd46cce3b3735c8f0c1a65a33c46f0c3f
author Sebastian Pipping <sebastian@pipping.org> 1463512101 +0200
committer Sebastian Pipping <sebastian@pipping.org> 1463512101 +0200

Merge branch 'cve-2016-0718-fix-2-2-1'

Conflicts:
  expat/lib/xmltok.c