[Pkg-owncloud-commits] [owncloud-doc] 07/09: 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 05ea83caf88fd3bc885124373f35420ae0d318f3
Merge: a445d9c 0d52fd0
Author: David Prévot <taffit at debian.org>
Date:   Sat May 17 10:50:52 2014 -0400

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

 admin_manual/installation/installation_source.rst | 28 +++++++++++------------
 developer_manual/app/appframework/database.rst    |  6 ++---
 2 files changed, 17 insertions(+), 17 deletions(-)

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