Merge branch 'master' of /home/mdw/public-git/misc

* 'master' of /home/mdw/public-git/misc:
  timeout.c: Fix exit codes; useful message on exec failure.

diff --git a/debian/changelog b/debian/changelog
index 6018d13..1451331 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nsict-utils (1.2.5) experimental; urgency=low
+
+  * Some user-invisible build system changes.
+  * timeout: New program: run a command for at most a givne time.
+
+ -- Mark Wooding <mdw@distorted.org.uk>  Tue, 07 Jun 2011 10:13:49 +0100
+
 nsict-utils (1.2.4) experimental; urgency=low
 
   * locking: Don't kill target program with alarm clock.