Merge branch 'master' of git://ctrl.tukaani.org/xz
commit1de0850edb31c6c409983d80ee22b21488dad55f
authorJonathan Nieder <jrnieder@gmail.com>
Thu, 21 Jan 2010 10:22:16 +0000 (21 04:22 -0600)
committerJonathan Nieder <jrnieder@gmail.com>
Thu, 21 Jan 2010 10:22:16 +0000 (21 04:22 -0600)
tree73e74c1d42f4bacdf9010ae361b02bcd7fac861a
parent81b1c949f607e443c16d8695f92633ec2d6293d6
parent2a98fdffd68c66371279c211c29153c808ad5c1d
Merge branch 'master' of git://ctrl.tukaani.org/xz

Sync with upstream.

* 'master' of git://ctrl.tukaani.org/xz:
  Fix a typo in README.
debian/changelog