[med-svn] [python-cobra] 01/02: Merge branch 'master' into debian/jessie-backports

[Afif Elghraoui]

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

afif-guest pushed a commit to branch debian/jessie-backports
in repository python-cobra.

commit 952391432989e0ad4bed19eb1d4c95f7fe652637
Merge: da2cba3 070affb
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Sat Sep 19 11:54:39 2015 -0700

    Merge branch 'master' into debian/jessie-backports

 appveyor.yml                   |  2 +-
 cobra/VERSION                  |  2 +-
 cobra/io/mat.py                |  8 +++++--
 cobra/solvers/__init__.py      |  2 ++
 cobra/solvers/cplex_solver.py  | 48 +++++++++++++++++++++++++-----------------
 cobra/solvers/gurobi_solver.py | 30 +++++++++++++++++++++-----
 debian/changelog               |  6 ++++++
 7 files changed, 70 insertions(+), 28 deletions(-)

diff --cc debian/changelog
index 5b3f3cc,1cb9960..8705e99
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ python-cobra (0.4.0b4-1) unstable; urgency=medium
+ 
+   * Imported Upstream version 0.4.0b4
+ 
+  -- Afif Elghraoui <afif at ghraoui.name>  Sun, 13 Sep 2015 02:15:32 -0700
+ 
 +python-cobra (0.4.0b3-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Afif Elghraoui <afif at ghraoui.name>  Fri, 04 Sep 2015 19:09:54 -0700
 +
  python-cobra (0.4.0b3-1) unstable; urgency=medium
  
    * Imported Upstream version 0.4.0b3

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-cobra.git