Merge branch 'master' of git://ctrl.tukaani.org/xz
commit3b8d7075312ab748f250241f2189c6c7bb5fbcdd
authorJonathan Nieder <jrnieder@gmail.com>
Mon, 12 Apr 2010 22:24:18 +0000 (12 17:24 -0500)
committerJonathan Nieder <jrnieder@gmail.com>
Mon, 12 Apr 2010 22:24:18 +0000 (12 17:24 -0500)
treed8bc75ea65fb49f4640aea576bdf3d094a361395
parent6a1755d50444f86c594c096431d3f43a50bee1ad
parenta290cfee3e23f046889c022aa96b4eca2016fdda
Merge branch 'master' of git://ctrl.tukaani.org/xz

Sync with upstream.

* 'master' of git://ctrl.tukaani.org/xz:
  Show both elapsed time and estimated remaining time in xz -v.
  Add a simple tip to faq.txt about tar and xz.
  Updated THANKS.
debian/changelog