[Pkg-owncloud-commits] [owncloud-doc] 36/110: Merge branch 'stable7' into installdocfixes

[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 a82b638b6b7acfb3776394de998f0b5c0a4ead1f
Merge: 4435b64 485d2ba
Author: Carla Schroder <carla at owncloud.com>
Date:   Wed Dec 24 14:08:24 2014 -0800

    Merge branch 'stable7' into installdocfixes
    
    Conflicts:
    	admin_manual/installation/linux_installation.rst


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