From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Mon, 20 Jun 2011 21:59:29 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.b9.com/home/gitpub/kmrcl
X-Git-Tag: v1.104~1
X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=commitdiff_plain;h=c75067c8a9cb10b8c0d1f39c6fa6cafabea0a6f8

Merge branch 'master' of ssh://git.b9.com/home/gitpub/kmrcl

Conflicts:

	debian/changelog
---

c75067c8a9cb10b8c0d1f39c6fa6cafabea0a6f8
diff --cc debian/changelog
index 79dce9e,e26b49e..6077a6e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,8 @@@
  cl-kmrcl (1.104-1) unstable; urgency=low
  
 -  * lists.lisp: Add delete-alist and remove-alist
 +  * New upstream
  
-  -- Kevin M. Rosenberg <kmr@debian.org>  Fri, 01 Apr 2011 10:47:28 -0600
+  -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 20 Jun 2011 15:55:57 -0600
  
  cl-kmrcl (1.103-1) unstable; urgency=low