diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-03-14 12:41:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-03-14 12:41:48 -0400 |
| commit | 342fc28437f59edcea8fb61ff987ea1899140f35 (patch) | |
| tree | f192d5ec5be8a817124ccba3d08d03333e94e62e /debian | |
| parent | 95a1f6b2accca9b7c6a6c30c92380dc0de57d3a0 (diff) | |
| parent | 6cb4743cfb105427a00b551ebd51fc5c9626bfea (diff) | |
Merge branch 'master' into bloom
Conflicts:
Command/Commit.hs
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 938aba130..393234ba5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ git-annex (3.20120310) UNRELEASED; urgency=low detect then it's too small for the number of keys in a repository. * git-annex-shell: Runs hooks/annex-content after content is received or dropped. + * Work around a bug in rsync (IMHO) introduced by openSUSE's SIP patch. -- Joey Hess <joeyh@debian.org> Sat, 10 Mar 2012 14:03:22 -0400 |