[cdo] 32/84: Merge branch 'master' into dfsg

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository cdo.

commit 95c1982509bf89f8e1b1fb08b9f3bc7416adf328
Merge: 5256dbf bcf0eac
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Aug 27 23:11:48 2013 +0100

    Merge branch 'master' into dfsg

 src/._CdoMagicsMapper.h         | Bin 205 -> 0 bytes
 src/._StringUtilities.c         | Bin 205 -> 0 bytes
 src/._StringUtilities.h         | Bin 205 -> 0 bytes
 src/._magics_template_parser.c  | Bin 205 -> 0 bytes
 src/._results_template_parser.c | Bin 205 -> 0 bytes
 src/._template_parser.c         | Bin 205 -> 0 bytes
 src/._template_parser.h         | Bin 205 -> 0 bytes
 7 files changed, 0 insertions(+), 0 deletions(-)

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