[Pkg-owncloud-commits] [python-owncloud] 04/07: Merge tag 'upstream/0.3.1'

[Sandro Knauß]

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

hefee-guest pushed a commit to branch master
in repository python-owncloud.

commit eb98dfc39982b4fd3cf3e5ad03e5d172c20c0bad
Merge: ac647a3 cb55135
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sat Nov 23 02:18:47 2013 +0100

    Merge tag 'upstream/0.3.1'

 CHANGELOG         |  12 ++-
 README.md         |  57 +++++++----
 csync/csync.py    |  85 +++++++++++-----
 csync/csynclib.py | 284 ++++++++++++++++++++++++++++--------------------------
 csync/version.dat |   2 +-
 csync/version.py  |   2 +-
 doc/oclient.1     |  24 +++--
 doc/oclient.1.txt |  14 ++-
 pre-commit        |   2 +-
 setup.py          |   2 +-
 10 files changed, 283 insertions(+), 201 deletions(-)

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