tree 234d5aebb3c04aca81c85a1fca571351d341e94a
parent 42c25096d90922c1d5f789fc778a15a99146b2a1
parent 9d32a034611c8bcf126970a97b939ae349870065
author Jonathan Nieder <jrnieder@gmail.com> 1347312153 -0700
committer Jonathan Nieder <jrnieder@gmail.com> 1347312153 -0700

Merge branch 'jn/5.1.1alpha+20120614'

Recent changes from upstream, including a documentation update and
small correctness fix for the "minimal version to decode" field.
Thanks to Lasse Collin for advice about which patches to apply.

After these changes, the xz and liblzma API and ABI match 5.1.2alpha,
except that no features that were not already present in Debian sid
have been added.