[Pkg-owncloud-commits] [owncloud-doc] 196/270: Merge pull request #406 from owncloud/add-amahi

[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 d3ad65e9f83b2fb7e6d12f17bff812a20b5ef6f0
Merge: 4a8d78f b7846cc
Author: Frank Karlitschek <frank at owncloud.org>
Date:   Sat Jun 28 08:40:30 2014 -0400

    Merge pull request #406 from owncloud/add-amahi
    
    add amahi instructions link. Fixes #404.

 admin_manual/installation/installation_others.rst | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

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