| commit | 69c10903b7fc25c039f146b83b18248d7d2c251a | [log] [tgz] |
|---|---|---|
| author | Jonathan Nieder <jrnieder@gmail.com> | Mon Sep 10 16:14:14 2012 -0700 |
| committer | Jonathan Nieder <jrnieder@gmail.com> | Mon Sep 10 16:14:14 2012 -0700 |
| tree | d20de0adf846fbed2ab9b6f36a6e90b0c527a53d | |
| parent | 47e884b8f39c028df9eb7e25a9d6b08f0e29b671 [diff] | |
| parent | 0147c4c37e9684acdeea8aec9ac08ffdfb790041 [diff] |
Merge branch 'master' into pu A bit of an ugly -Xours merge in xz-utils/README.Debian. * master: debian: prepare for upload xz-utils/README.Debian: flesh out "differences from upstream" xz-utils/README.Debian: Document patches