[Pkg-owncloud-commits] [owncloud-doc] 03/05: Merge remote-tracking branch 'upstream/stable7' 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 51c00806260534df92143eacf03d41369ba5490c
Merge: 38b5f27 2964217
Author: David Prévot <david at tilapin.org>
Date:   Mon Jun 1 21:12:57 2015 -0400

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

 user_manual/images/deleted_files.png | Bin 25471 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

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