[Pkg-owncloud-commits] [owncloud-doc] 01/02: Merge tag 'upstream/0_20131206'

[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-doc.

commit c4f67fdc3d207f077d05f2eaeddc3012b786f9d2
Merge: a04efae 1d300cc
Author: David Prévot <taffit at debian.org>
Date:   Fri Dec 6 22:11:43 2013 -0400

    Merge tag 'upstream/0_20131206'
    
    Upstream version 0~20131206

 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