[all-knowing-dns] 01/04: Merge branch 'upstream'

[Michael Stapelberg]

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

stapelberg pushed a commit to branch master
in repository all-knowing-dns.

commit 87868330ebd72ff68dc514de40034c560e511126
Merge: a5f297f 84e33e1
Author: Michael Stapelberg <michael at stapelberg.de>
Date:   Mon Sep 23 22:26:00 2013 +0200

    Merge branch 'upstream'
    
    Somehow, the upstream import of 1.4 was not properly done back then.


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/all-knowing-dns.git