[saods9] 02/03: Merge branch 'debian-stable' into debian

[Ole Streicher]

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

olebole-guest pushed a commit to branch debian
in repository saods9.

commit d48093a303a0dc0039d4d68b30bca2733202f272
Merge: 1c39661 a629b06
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Sep 26 19:47:46 2013 +0200

    Merge branch 'debian-stable' into debian
    
    Conflicts:
    	debian/changelog

 debian/changelog |    6 ++++++
 debian/rules     |    7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 6755c35,533ef32..6fa0e6b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,9 +1,21 @@@
 +saods9 (7.3~b3+dfsg-1~exp1) experimental; urgency=low
 +
 +  * New (beta) upstream version
 +
 + -- Ole Streicher <debian at liska.ath.cx>  Thu, 26 Sep 2013 12:14:34 +0200
 +
+ saods9 (7.2+dfsg-2) unstable; urgency=low
+ 
+   * Create make.linux on clean, closes: #724082
+ 
+  -- Ole Streicher <debian at liska.ath.cx>  Thu, 26 Sep 2013 18:26:11 +0200
+ 
 +saods9 (7.3~b2+dfsg-1~exp1) experimental; urgency=low
 +
 +  * New (beta) upstream version
 +
 + -- Ole Streicher <debian at liska.ath.cx>  Thu, 01 Aug 2013 21:46:38 +0200
 +
  saods9 (7.2+dfsg-1) unstable; urgency=low
  
    * Change distribution to unstable

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/saods9.git