[med-svn] [bedtools] 02/02: Merge branch 'master' into debian/unstable

[Charles Plessy]

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

plessy pushed a commit to branch debian/unstable
in repository bedtools.

commit a4f6ab7ef8c6b18b0694725b2ae37f177d5297a9
Merge: 856a5fd 69e2731
Author: Charles Plessy <plessy at debian.org>
Date:   Fri Sep 19 10:03:36 2014 +0900

    Merge branch 'master' into debian/unstable

 README.md                        | 2 +-
 docs/conf.py                     | 4 ++--
 docs/content/tools/intersect.rst | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/bedtools.git