[funtools] 02/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 funtools.

commit 3b219055e537b96ae8d980394e93204993267e23
Merge: fff4d5c b2a9456
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Apr 2 10:11:04 2014 +0200

    Merge branch 'upstream' into debian

 .gdb_history | 256 -----------------------------------------------------------
 .pure        |   0
 .pure.352    |   0
 .purify      |   2 -
 filter/ftest | Bin 75340 -> 0 bytes
 gnu/_sort    | Bin 67498 -> 0 bytes
 util/tfoo    | Bin 10453 -> 0 bytes
 7 files changed, 258 deletions(-)

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