| commit | be4b1c06daba1849b8ff5e00bae5caf47f6c39fd | [log] [tgz] |
|---|---|---|
| author | Sebastian Pipping <sebastian@pipping.org> | Tue May 17 21:08:21 2016 +0200 |
| committer | Sebastian Pipping <sebastian@pipping.org> | Tue May 17 21:08:21 2016 +0200 |
| tree | f9dbe477dce429eaf3e8f805460106a3dcf99c9c | |
| parent | f0bec73b018caa07d3e75ec8dd967f3785d71bde [diff] | |
| parent | a1bc009dd46cce3b3735c8f0c1a65a33c46f0c3f [diff] |
Merge branch 'cve-2016-0718-fix-2-2-1' Conflicts: expat/lib/xmltok.c