[funtools] 06/06: Merge branch 'upstream' into debian

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository funtools.

commit 4491bfe299b32575178ef1b015bb8b98f5e0f2ed
Merge: 40b741b d1d21bc
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Oct 26 19:45:20 2014 +0100

    Merge branch 'upstream' into debian

 funtest/mkev2                                | Bin 18912 -> 0 bytes
 util/zlib-1.2.3/contrib/masmx86/gvmat32.obj  | Bin 10241 -> 0 bytes
 util/zlib-1.2.3/contrib/masmx86/inffas32.obj | Bin 14893 -> 0 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

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