[Pkg-owncloud-commits] [owncloud] 07/28: Merge pull request #6208 from owncloud/enc_only_create_new_key_if_no_other_key_exists

[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 3e6b18b2d019ffa1ddbf3acf99368481d6de0d02
Merge: 7eb505e 91ca1cf
Author: Björn Schießle <bjoern at schiessle.org>
Date:   Fri Dec 6 03:07:52 2013 -0800

    Merge pull request #6208 from owncloud/enc_only_create_new_key_if_no_other_key_exists
    
    [Encryption] Only create new key if no other key exists

 apps/files_encryption/hooks/hooks.php              | 51 ++++++++++++----------
 apps/files_encryption/lib/util.php                 | 17 ++++++--
 .../templates/settings-personal.php                |  2 +-
 3 files changed, 42 insertions(+), 28 deletions(-)

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