[cmor] 104/190: Merge branch 'devel' of uv-cdat.llnl.gov:cmor into devel

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository cmor.

commit d100b0e4a021d386962bf7a820f150d7f7320554
Merge: 5c8b122 a55481c
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date:   Thu Apr 7 11:13:59 2011 -0700

    Merge branch 'devel' of uv-cdat.llnl.gov:cmor into devel


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