[coinor-cgl] 03/03: Merge branch 'master' of ssh://git.debian.org/git/debian-science/packages/coinor-cgl

[Miles Lubin]

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

mlubin-guest pushed a commit to branch master
in repository coinor-cgl.

commit e23114d454baa6a7d5377b925d917c8532eb4b57
Merge: 940afea f814088
Author: Miles Lubin <miles.lubin at gmail.com>
Date:   Wed Sep 3 21:33:17 2014 -0400

    Merge branch 'master' of ssh://git.debian.org/git/debian-science/packages/coinor-cgl
    
    Conflicts:
    	debian/changelog

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

diff --cc debian/changelog
index 2bd91bd,2bb166a..99ab0da
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
 +coinor-cgl (0.58.9-1) unstable; urgency=low
 +
 +  * New upstream version.
 +  * Use dh_autotools-dev to update config.{sub,guess} for new ports.
 +    - Thanks to Adam Conrad
 +  * Remove shlibdeps patch incorporated upstream with configure option
 +  * Remove missing-headers patch incorporated upstream
 +
 + -- Miles Lubin <miles.lubin at gmail.com>  Wed, 03 Sep 2014 17:45:03 -0400
 +
+ coinor-cgl (0.58.4-2) unstable; urgency=low
+ 
+   * Team upload.
+   * Really upload to unstable.
+ 
+  -- Sébastien Villemot <sebastien at debian.org>  Sat, 30 Nov 2013 23:40:52 +0100
+ 
  coinor-cgl (0.58.4-1) experimental; urgency=low
  
    * New upstream version.

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