[python-cpl] 01/02: 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 4c07651d62d0b2726889684f2d04cf5ab28d7ae9
Merge: 89388f5 0933cb5
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Nov 6 18:29:21 2013 +0100

    Merge branch 'upstream' into debian

 PKG-INFO       |    6 +++---
 cpl/param.py   |    2 ++
 cpl/version.py |    2 +-
 setup.py       |    2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

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