[magics] 25/31: Merge branch 'dev-metview-devel'

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository magics.

commit 707432283444d78a5dd331f4694175c0602d9696
Merge: 0258678 fc33851
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Dec 18 09:25:05 2013 +0000

    Merge branch 'dev-metview-devel'

 debian/changelog                       |  1 +
 debian/control                         | 18 +++++++++++++-----
 debian/libmagics++-metview-dev.install |  1 +
 debian/libmagplus3.install             |  1 +
 debian/patches/metview_fixes.patch     | 17 +++++++++++++++++
 debian/patches/series                  |  1 +
 debian/rules                           |  2 ++
 7 files changed, 36 insertions(+), 5 deletions(-)

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