[Python-modules-commits] [keyrings.alt] 07/14: Merge with master

[Dmitry Shachnev]

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

mitya57 pushed a commit to tag 1.0
in repository keyrings.alt.

commit ed34124fcc929cc5418e936f0c35116d00c900e3
Merge: 9da5490 6d571b4
Author: Jason R. Coombs <jaraco at jaraco.com>
Date:   Thu Jan 14 06:07:50 2016 -0500

    Merge with master

 skeleton/__init__.py => .gitignore | 0
 .hgignore                          | 2 --
 docs/conf.py                       | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

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