From b43cac2a18cf90f49a2e20fb9bb2342a2efea908 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 14 Apr 2014 14:22:44 -0400 Subject: it's landed! merge remotecontrol into master --- debian/changelog | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d74e29760..e886f14ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ git-annex (5.20140413) UNRELEASED; urgency=medium * assistant: Now detects immediately when other repositories push changes to a ssh remote, and pulls. - XMPP is no longer needed in this configuration! - Requires the remote server have git-annex-shell with notifychanges support. + ** XMPP is no longer needed in this configuration! ** + This requires the remote server have git-annex-shell with + notifychanges support (>= 5.20140405) * webapp: Show a network signal icon next to ssh and xmpp remotes that it's currently connected with. * webapp: Rework xmpp nudge to prompt for either xmpp or a ssh remote be @@ -12,7 +13,7 @@ git-annex (5.20140413) UNRELEASED; urgency=medium and pulls. * remotedaemon: When network connection is lost, close all cached ssh connections. - * Improve handling on monthly/yearly scheduling. + * Improve handling of monthly/yearly scheduling. * Avoid depending on shakespeare except for when building the webapp. -- Joey Hess Fri, 11 Apr 2014 21:33:35 -0400 -- cgit v1.2.3