[Python-modules-commits] [python-zeroconf] 01/01: record new upstream branch and merge it

[Ruben Undheim]

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository python-zeroconf.

commit 4e10fd08e8aa446ce534fcefa70ff7ef4c34ff58
Merge: dead1f7 0b9093d
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Tue Oct 6 18:18:41 2015 +0200

    record new upstream branch and merge it

 README.rst       | 36 ++++++++++++++++++++++++++++--------
 debian/.git-dpm  | 14 +++++++-------
 test_zeroconf.py | 10 ++++++++++
 zeroconf.py      | 12 +++++++++---
 4 files changed, 54 insertions(+), 18 deletions(-)

diff --cc debian/.git-dpm
index c63822e,0000000..efd98f4
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- d1ee5ce7558060ea8d92f804172f67f960f814bb
- d1ee5ce7558060ea8d92f804172f67f960f814bb
- d1ee5ce7558060ea8d92f804172f67f960f814bb
- d1ee5ce7558060ea8d92f804172f67f960f814bb
- python-zeroconf_0.17.2.orig.tar.gz
- b635976809dd362dc7b2b4cf7948059eceed103d
- 27798
++0b9093de863928d7f13092aaf2be1f0a33f4ead2
++0b9093de863928d7f13092aaf2be1f0a33f4ead2
++0b9093de863928d7f13092aaf2be1f0a33f4ead2
++0b9093de863928d7f13092aaf2be1f0a33f4ead2
++python-zeroconf_0.17.4.orig.tar.gz
++ad06e8f202bcf2175627d085fba886b58af1116f
++28205

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-zeroconf.git