[libdap] 39/48: Merge

[Alastair McKinstry]

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

mckinstry pushed a commit to tag unstable/3.12.0-1
in repository libdap.

commit 521b0262a12434eba2453717c6bdbb23270708c0
Merge: 4aabcf0 fbcd694
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Oct 17 22:25:53 2013 +0100

    Merge

 debian/changelog | 15 ++++++++++++---
 debian/rules     | 12 +++++++-----
 debian/watch     |  3 +++
 3 files changed, 22 insertions(+), 8 deletions(-)

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