[SCM] thin, simple and robust network communication layer on top of UDP branch, master, updated. upstream/1.2-15-g152879f

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit 152879f1dfd09ce277ea1076d35e1b90708f7fa7
Author: Ansgar Burchardt <ansgar at 2008.43-1.org>
Date:   Thu Jul 10 23:08:49 2008 +0200

    merge changelog entries from unreleased 1.1-3, remove obsolete entry

diff --git a/debian/changelog b/debian/changelog
index 8d8c60f..543ff80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 enet (1.2-1) UNRELEASED; urgency=low
 
+  [ Jon Dowland ]
+  * add Homepage: control field to source stanza
+
+  [ Ansgar Burchardt ]
   * New upstream release
     + bump SONAME of shared library
     + update version in enet.pc
@@ -16,16 +20,6 @@ enet (1.2-1) UNRELEASED; urgency=low
 
  -- Ansgar Burchardt <ansgar at 43-1.org>  Wed, 09 Jul 2008 14:35:33 +0200
 
-enet (1.1-3) unstable; urgency=low
-
-  [ Gonéri Le Bouder ]
-  * dpkg-buildpackage -B doesn't create arch all packages anymore
-
-  [ Jon Dowland ]
-  * add Homepage: control field to source stanza
-
- -- Jon Dowland <jon at alcopop.org>  Mon, 03 Dec 2007 17:43:04 +0000
-
 enet (1.1-2) unstable; urgency=low
 
   * add kfreebsd.diff (Closes: #414348)

-- 
thin, simple and robust network communication layer on top of UDP