diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-26 00:10:41 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-26 00:10:41 -0400 |
| commit | 89a33e4ce1219dff81f6c5fd296b6e6ba6866ea3 (patch) | |
| tree | d5d88ff78f40fd9e4fc932a5ccfadcf9b17fdd31 /debian | |
| parent | b4f43466b1100b158d2a69c01e646896ba34494f (diff) | |
| parent | 0a87d90900949e6f7e75ab2ac83b4135746d7602 (diff) | |
Merge branch 'master' into xmpp
Conflicts:
Assistant/Threads/MountWatcher.hs
Assistant/Threads/NetWatcher.hs
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 2278195c2..aa3eb9db5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ git-annex (3.20121018) UNRELEASED; urgency=low * configure: Check that checksum programs produce correct checksums. * Re-enable dbus, using a new version of the library that fixes the memory leak. + * Use USER and HOME environment when set, and only fall back to getpwent, + which doesn't work with LDAP or NIS. -- Joey Hess <joeyh@debian.org> Wed, 17 Oct 2012 14:24:10 -0400 |