[Pkg-asciidoc-commits] r57 - trunk/debian

[Alexander Wirt]

Author: formorer
Date: 2009-06-19 15:38:54 +0000 (Fri, 19 Jun 2009)
New Revision: 57

Modified:
   trunk/debian/changelog
Log:
Merge


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-06-10 19:29:52 UTC (rev 56)
+++ trunk/debian/changelog	2009-06-19 15:38:54 UTC (rev 57)
@@ -21,6 +21,7 @@
 
  -- Alexander Wirt <formorer at debian.org>  Fri, 13 Mar 2009 10:27:10 +0100
 
+>>>>>>> .r56
 asciidoc (8.2.7-2) unstable; urgency=low
 
   * Reintroduce normpatch-not-realpath.patch which fixes some FTBFS