[Pkg-owncloud-commits] [owncloud-client] 116/175: Merge pull request #3291 from RealRancor/backport_3004_2978_1.8

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit b1658cb1cfba5b5052b0eadf3990a6a4797aaff2
Merge: e2a26f0 6ba3324
Author: Daniel Molkentin <daniel at molkentin.de>
Date:   Thu May 28 17:22:06 2015 +0200

    Merge pull request #3291 from RealRancor/backport_3004_2978_1.8
    
    Backport #3004 and #2978 to 1.8

 doc/architecture.rst    | 6 +++---
 doc/troubleshooting.rst | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

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