[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 266c67946700489ea3c94ea6cb9eeb80b489610b
Merge: 32915a6 c9cf5ce
Author: David Prévot <taffit at debian.org>
Date:   Sun Oct 13 18:28:50 2013 -0400

    Merge branch 'upstream' into dfsg_clean

 .../configuration/configuration_automation.rst     |   48 ++++++++++++++++++--
 1 file changed, 43 insertions(+), 5 deletions(-)

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