[med-svn] [libgtextutils] 62/83: Merge branch 'master' into debian/unstable

[Charles Plessy]

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

plessy pushed a commit to branch debian/unstable
in repository libgtextutils.

commit 7b608ed5b77481904977d529748948974368fd7a
Merge: 4321fac d95f488
Author: Charles Plessy <plessy at debian.org>
Date:   Sat Nov 9 18:07:29 2013 +0900

    Merge branch 'master' into debian/unstable
    
    Conflicts:
    	tests/test_pipe_fitter.c

 tests/test_pipe_fitter.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/libgtextutils.git