[Pkg-voip-commits] [SCM] python-eventlib branch, master, updated. upstream/0.1.0-4-g0ed81d3

[Daniel Pocock]

The following commit has been merged in the master branch:
commit 0ed81d34bd53f6917b1873b4ba7884405f09b959
Author: Daniel Pocock <daniel at pocock.com.au>
Date:   Thu Oct 4 09:13:24 2012 +0200

    Remove Conflicts eventlet

diff --git a/debian/control b/debian/control
index ecbaa7e..5c8b9cb 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Vcs-Browser: http://git.debian.org/?p=pkg-voip/python-eventlib.git;a=summary
 Package: python-eventlib
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python-greenlet, python-openssl
-Conflicts: python-eventlet
 Description: event-based networking library written in Python.
  Achieves high scalability by using non-blocking I/O while at the same
  time retaining high programmer usability by using coroutines to make the

-- 
python-eventlib