[Pkg-owncloud-commits] [owncloud-doc] 09/44: Merge branch 'stable6' into fixing-stable6

[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 18c354f5740617eac0badb6c509a2b463d47dd2c
Merge: 921bdce 472dc20
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Tue Nov 26 15:24:40 2013 +0100

    Merge branch 'stable6' into fixing-stable6
    
    Conflicts:
    	admin_manual/configuration/configuration_preview.rst

 admin_manual/configuration/configuration_preview.rst | 4 ----
 1 file changed, 4 deletions(-)

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