[Pkg-owncloud-commits] [owncloud-doc] 12/14: Merge remote-tracking branch 'upstream/stable6' into upstream

[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 eb305e208f5f3c2903f91199fe274c0f96558896
Merge: 44c5254 d4c90cd
Author: David Prévot <taffit at debian.org>
Date:   Wed Jan 22 09:04:27 2014 -0400

    Merge remote-tracking branch 'upstream/stable6' into upstream

 admin_manual/installation/installation_source.rst | 19 +++++++++----------
 user_manual/files/versioncontrol.rst              |  4 +---
 2 files changed, 10 insertions(+), 13 deletions(-)

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