[SCM] python-pyo/master: Fix conflict.

[tiago at users.alioth.debian.org]

Fixing series.
Removing patch, fixed by upstream.
New upstream release - resolving conflicts.
New upstream release.
Merge tag 'upstream/0.7.6'
Imported Upstream version 0.7.6
Imported Upstream version 0.7.6
New upstream release - resolving conflicts.
Imported Upstream version 0.7.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d32d0500b54a537cd13b6e385668d1ee818652e9
X-Git-Newrev: f1cf5ea708ac80f3367aed842e971c4708b3a5e9

The following commit has been merged in the master branch:
commit 75275f70d37c7b302fe8029c73bfec55bc7df997
Merge: 58eadad8de51365590f039a7d8b7325ae6cf0cd2 d32d0500b54a537cd13b6e385668d1ee818652e9
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date:   Tue Jul 28 17:26:12 2015 -0400

    Fix conflict.

diff --combined debian/changelog
index abc6ce6,336085d..438dfc0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,9 @@@
- python-pyo (0.7.5-2) unstable; urgency=medium
+ python-pyo (0.7.6-1) unstable; urgency=medium
  
-   * Minor packaging fixes and push to unstable.
+   * New upstream release.
  
-  -- Tiago Bortoletto Vaz <tiago at debian.org>  Mon, 25 May 2015 09:55:36 -0400
+  -- Tiago Bortoletto Vaz <tiago at debian.org>  Tue, 28 Jul 2015 17:02:57 -0400
++>>>>>>> d32d0500b54a537cd13b6e385668d1ee818652e9
  
  python-pyo (0.7.5-1) experimental; urgency=medium
  

-- 
python-pyo packaging