[Pkg-owncloud-commits] [owncloud] 49/69: Merge branch 'sharing_cleanup' of github.com:owncloud/core into sharing_cleanup

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit f85e968883bfdb56bc3e1a22221acaf21f0943b4
Merge: d3f957c dbb9307
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Wed May 7 17:57:32 2014 +0200

    Merge branch 'sharing_cleanup' of github.com:owncloud/core into sharing_cleanup

 apps/files_sharing/lib/helper.php  | 2 +-
 apps/files_sharing/lib/updater.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


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