[Pkg-mpd-commits] [python-mpd] 210/262: Merge branch 'pull-request-24'

[Simon McVittie]

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

smcv pushed a commit to branch upstream
in repository python-mpd.

commit e098582b319d1161a0a7f18b49164a0667ce360a
Merge: b50c6d9 c0164d7
Author: Jörg Thalheim <joerg at higgsboson.tk>
Date:   Tue Jun 25 08:28:50 2013 +0200

    Merge branch 'pull-request-24'
    
    Conflicts:
    	README.rst

 .gitignore                            |   3 +
 INSTALL.rst                           |  48 +++++++
 README.rst                            | 222 ++++--------------------------
 doc/Makefile                          | 177 ++++++++++++++++++++++++
 CHANGES.rst => doc/changes.rst        |   0
 doc/conf.py                           | 248 ++++++++++++++++++++++++++++++++++
 doc/index.rst                         |  57 ++++++++
 doc/topics/advanced.rst               |  67 +++++++++
 doc/{ => topics}/commands.rst         |   0
 doc/topics/getting-started.rst        |  66 +++++++++
 doc/topics/logging.rst                |  15 ++
 PORTING.rst => doc/topics/porting.rst |   0
 setup.cfg                             |   5 +
 13 files changed, 711 insertions(+), 197 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mpd/python-mpd.git