From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 20 Apr 2018 15:55:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'mariner/fishdescriptor'
X-Git-Tag: archive/debian/6.0.0~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=7387948ac5bb282f6386da0c152dc4ad51e67ca9

Merge remote-tracking branch 'mariner/fishdescriptor'
---

7387948ac5bb282f6386da0c152dc4ad51e67ca9
diff --cc debian/changelog
index 177dd70,265c157..1bf6008
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,17 @@@
 +chiark-utils (5.0.3~iwj) unstable; urgency=medium
 +
 +  xbatmon-simple:
 +  * Minor improvements to the .txt doc.
 +
 + --
 +
+ chiark-utils (5.0.3~citrix3) unstable; urgency=medium
+ 
+   fishdescriptor:
+   * New utility.
+ 
+  -- Ian Jackson <ian.jackson@citrix.com>  Fri, 20 Apr 2018 16:46:48 +0100
+ 
  chiark-utils (5.0.3~citrix2) unstable; urgency=medium
  
    with-lock-ex: