[Pkg-owncloud-commits] [owncloud-doc] 03/05: 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 e9f2ea33ef5907a24acbfaf8847eb6132a909b77
Merge: ccafc8e fceaa27
Author: David Prévot <taffit at debian.org>
Date:   Sat May 10 10:51:55 2014 -0400

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

 user_manual/files/versioncontrol.rst | 1 +
 1 file changed, 1 insertion(+)

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