[Pkg-owncloud-commits] [owncloud-doc] 39/43: Merge pull request #157 from Wikinaut/patch-1

[David Prévot]

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

taffit pushed a commit to branch dfsg_clean
in repository owncloud-doc.

commit 105cbb289ab08408ae85fdc7c2a0dcc1005b262b
Merge: 32c74e8 2663d2c
Author: Bernhard Posselt <nukeawhale at gmail.com>
Date:   Sat Aug 10 05:11:40 2013 -0700

    Merge pull request #157 from Wikinaut/patch-1
    
    Update configuration_encryption.rst

 admin_manual/configuration/configuration_encryption.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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