[libocas] 04/09: Merge branch 'upstream'

[Christian Kastner]

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

chrisk-guest pushed a commit to branch master
in repository libocas.

commit 17128fe912cf353197ea8b574ac97f2bfb95c21c
Merge: 269b56e 6d2908c
Author: Christian Kastner <ckk at kvr.at>
Date:   Sat Jul 11 16:47:19 2015 +0200

    Merge branch 'upstream'
    
    This is a merge with the DFSG-cleaned sources of version 0.97

 data/lena.jpg | Bin 162986 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

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