[Pkg-running-devel] [SCM] Debian package for pytrainer branch, master, updated. debian/1.10.1-2-6-g98c7ee0

[Christian PERRIER]

The following commit has been merged in the master branch:
commit 03f23697dff59f99015256e10a4bafc7ea84e79d
Merge: d091a068d6491584badd272d0f9c1757663580fc 2964414e60abda03fe5305645ca371b67f59028a
Author: Christian PERRIER <bubulle at debian.org>
Date:   Sun May 26 08:08:05 2013 +0300

    Resolve conflict

diff --combined debian/changelog
index 5d5a67f,b2834c8..f226c84
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- pytrainer (1.10.1-2) UNRELEASED; urgency=low
++pytrainer (1.10.1-3) UNRELEASED; urgency=low
 +
 +  * Change upstream home page.
 +  * Add VCS-* fields to debian/control
 +
 + -- Christian Perrier <bubulle at debian.org>  Tue, 09 Apr 2013 08:14:09 +0200
 +
+ pytrainer (1.10.1-2) unstable; urgency=low
+ 
+   * Upload to unstable
+ 
+  -- Christian Perrier <bubulle at debian.org>  Sun, 19 May 2013 14:41:40 +0200
++>>>>>>> 2964414e60abda03fe5305645ca371b67f59028a
+ 
  pytrainer (1.10.1-1) experimental; urgency=low
  
    * New upstream version. Closes: #704301

-- 
Debian package for pytrainer