[cpl-plugin-amber] 12/12: 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 cpl-plugin-amber.

commit b14c4951dfb2f70d5327c48f81e940b100385f8d
Merge: 07a0c62 d88286d
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Dec 4 15:10:02 2013 +0100

    Merge branch 'upstream' into debian

 calib/cal_size | 1 +
 1 file changed, 1 insertion(+)

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