[Python-modules-commits] [pymodbus] 03/03: record new upstream branch and merge it

[Wolfgang Borgert]

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

debacle pushed a commit to tag debian/1.2.0+git20151013-1
in repository pymodbus.

commit a4fc8cd98d7d2fd4420945c0d0b127b65d9bff28
Merge: 655c07a de109b9
Author: W. Martin Borgert <debacle at debian.org>
Date:   Tue Oct 13 23:38:45 2015 +0200

    record new upstream branch and merge it

 debian/.git-dpm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index 66ae47c,0000000..8e4c80b
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 1ac6299dd65d941bf2cd78450681301d20addf97
- 1ac6299dd65d941bf2cd78450681301d20addf97
- 1ac6299dd65d941bf2cd78450681301d20addf97
- 1ac6299dd65d941bf2cd78450681301d20addf97
- pymodbus_1.2.0+git20150925.orig.tar.gz
- 5feae02502eeaf5ba4753a6fc188b23e0ba3a3ab
- 501714
++de109b99b0221dce73c46097e1e8a764724b95f8
++de109b99b0221dce73c46097e1e8a764724b95f8
++de109b99b0221dce73c46097e1e8a764724b95f8
++de109b99b0221dce73c46097e1e8a764724b95f8
++pymodbus_1.2.0+git20151013.orig.tar.gz
++5421e4ff0ecfbac69c879a35bfbc3075017cd332
++501596
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

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