[Python-modules-commits] [python-getdns] 02/04: Merge tag 'upstream/0.6.0'

[Ondrej Sury]

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

ondrej pushed a commit to branch master
in repository python-getdns.

commit f72501666da308463fb4703e1f0db264b461f3ba
Merge: 18f01d4 e10dc03
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Jan 27 10:42:54 2016 +0100

    Merge tag 'upstream/0.6.0'
    
    Upstream version 0.6.0
    
    Conflicts:
    	setup.py

 .gitignore                |   1 +
 context.c                 |  31 ++++---
 doc/conf.py               |   4 +-
 doc/functions.rst         | 115 ++++++++++++-----------
 doc/index.rst             |  17 ++--
 doc/response.rst          |  17 +++-
 examples/client_subnet.py |  54 +++++++++++
 examples/dane_encrypt.py  |   0
 examples/pinset.py        |  17 ++++
 examples/tsig_demo.py     |  15 +++
 getdns.c                  |  38 +++++++-
 pygetdns.h                |   8 ++
 pygetdns_util.c           | 231 ++++++++++++++++++++++++++++++++++++----------
 result.c                  |  13 +++
 setup.py                  |  11 +--
 15 files changed, 439 insertions(+), 133 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-getdns.git