[cmor] 129/190: Merge branch 'master' into gdevel

[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 e66c091644e9841701d84d8005a6e093ff3198ba
Merge: 0132000 72835d2
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date:   Fri May 17 10:13:19 2013 -0700

    Merge branch 'master' into gdevel

 RELEASE-NOTES     |  2 ++
 Src/_cmormodule.c |  4 ++--
 Src/cmor_axes.c   |  4 ++--
 configure         | 18 +++++++++---------
 configure.ac      |  2 +-
 include/cmor.h    |  2 +-
 6 files changed, 17 insertions(+), 15 deletions(-)

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