[Pkg-owncloud-commits] [python-owncloud] 92/96: Merge remote-tracking branch 'upstream/master'

[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 83bc7f93f8323e5f52c5d0a00903966cfa07912a
Merge: a160ee0 5b90e20
Author: Diederik de Haas <github at cknow.org>
Date:   Mon Apr 15 20:00:44 2013 +0200

    Merge remote-tracking branch 'upstream/master'

 CHANGELOG         |    7 +++++--
 csync/version.dat |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

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