[med-svn] [filo] 02/08: Merge branch 'upstream'

[Charles Plessy]

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

plessy pushed a commit to branch master
in repository filo.

commit 36fa70086c986e653f7e05bc74b95693f0dcc09c
Merge: be0c1cd 3c9fb01
Author: Charles Plessy <plessy at debian.org>
Date:   Tue Nov 26 07:42:23 2013 +0900

    Merge branch 'upstream'

 src/groupBy/groupBy.cpp | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

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