[Pkg-owncloud-commits] [owncloud] 96/111: Merge branch 'master' into encryption_check_if_file_is_encrypted

[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 b4e7258a04f9b634031984aea655ed964aa003d3
Merge: f3e2a63 30b8f4e
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Wed Nov 20 14:45:04 2013 +0100

    Merge branch 'master' into encryption_check_if_file_is_encrypted

 lib/private/files.php |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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