[python-cpl] 01/03: Merge branch 'upstream' 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 python-cpl.

commit 2d57b4e0471d35efbac3276a25ebf36a718a020b
Merge: c2ed2fd bf41d71
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Mar 18 12:08:51 2014 +0100

    Merge branch 'upstream' into debian

 PKG-INFO          |  6 ++---
 cpl/CPL_library.c | 11 ++++++++--
 cpl/CPL_library.h |  3 +++
 cpl/CPL_recipe.c  |  2 +-
 cpl/esorex.py     | 65 ++++++++++++++++++++++++++++++-------------------------
 cpl/version.py    |  2 +-
 setup.py          |  2 +-
 7 files changed, 53 insertions(+), 38 deletions(-)

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