Merge branch 'master' of git://ctrl.tukaani.org/xz
commitedec583bee2c5e1eb43d04fbc916ccfef2102165
authorJonathan Nieder <jrnieder@gmail.com>
Mon, 8 Mar 2010 00:07:58 +0000 (7 18:07 -0600)
committerJonathan Nieder <jrnieder@gmail.com>
Mon, 8 Mar 2010 00:07:58 +0000 (7 18:07 -0600)
treeb7e4352ed114575959d96634d1006799b437b265
parentb8b923fc9058520dffbfaecbf54ef96dc31d9783
parentf4b2b52624b802c786e4e2a8eb6895794dd93b24
Merge branch 'master' of git://ctrl.tukaani.org/xz

Sync with upstream.

* 'master' of git://ctrl.tukaani.org/xz:
  Fix xzgrep to not break if filenames have spaces or quotes.
  Treat all integer multiplier suffixes as base-2.
  Consistently round up the memory usage limit in messages.
  Change the default of --enable-assume-ram from 32 to 128 MiB.
  Increase the default memory usage limit on "low-memory" systems.
  Updated THANKS.
  Fix missing initialization in lzma_strm_init().
debian/changelog