[SCM] marco Debian package branch, wheezy-bpo, updated. debian/1.8.0+dfsg1-5_bpo70+1-3-g5d978a2

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/marco.git;a=commitdiff;h=077887d

The following commit has been merged in the wheezy-bpo branch:
commit 077887dfddd2f74e3d1c479cb223b3d03d0748a3
Merge: 477e99188c1ee4033fcf05fedf90a1400896c3c3 746a4139a163e9198136c0e04f7b63671f6c6710
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jul 8 00:19:07 2014 +0200

    Merge branch 'master' into wheezy-bpo
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog

 debian/changelog | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --cc debian/changelog
index 130e75e,ce21fa4..7b0b480
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,21 @@@
++marco (1.8.1+dfsg1-1~bpo70+1) UNRELEASED; urgency=low
++
++  * Upload to wheezy-backports.
++
++ -- Mike Gabriel <sunweaver at debian.org>  Sat, 07 Jun 2014 14:35:55 +0200
++
+ marco (1.8.1+dfsg1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Tue, 01 Jul 2014 19:00:07 +0200
+ 
 +marco (1.8.0+dfsg1-5~bpo70+1) wheezy-backports; urgency=low
 +
 +  * Upload to wheezy-backports.
 +
 + -- Mike Gabriel <sunweaver at debian.org>  Sat, 07 Jun 2014 14:35:55 +0200
 +
  marco (1.8.0+dfsg1-5) unstable; urgency=medium
  
    [ Vangelis Mouhtsis ]

-- 
marco Debian package