[Pkg-owncloud-commits] [owncloud-doc] 05/05: Merge branch 'upstream' into dfsg_clean

[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 1d300ccb03a3be07a36c0e495320865e4d2e7999
Merge: 7918cc9 413ca07
Author: David Prévot <taffit at debian.org>
Date:   Fri Dec 6 22:10:32 2013 -0400

    Merge branch 'upstream' into dfsg_clean

 go.php                           |  2 +-
 user_manual/files/encryption.rst | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

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