[Pkg-owncloud-commits] [owncloud] 04/223: Merge branch 'master' into update_shipped_apps_from_appstore

[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 c6dc9aeda827940518a322e43670f8136eb26104
Merge: 020255b 56b60b9
Author: Georg Ehrke <developer at georgehrke.com>
Date:   Sat May 31 17:55:01 2014 +0200

    Merge branch 'master' into update_shipped_apps_from_appstore

 core/js/js.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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