[Pkg-owncloud-commits] [owncloud-doc] 03/03: 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 1cc9a98e2523fa45dd5a67f3a6aae2bec043a103
Merge: 8fdf26c 9e2d5dc
Author: David Prévot <taffit at debian.org>
Date:   Wed Oct 30 12:30:27 2013 -0400

    Merge branch 'upstream' into dfsg_clean

 admin_manual/configuration/configuration_database.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