[Pkg-owncloud-commits] [owncloud-doc] 56/71: Merge branch 'clientdev' of github.com:owncloud/documentation into clientdev

[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 f8b3b2e8a974295b1fcf9e71d27dad329566e826
Merge: 52572a6 590d071
Author: Jos Poortvliet <jospoortvliet at gmail.com>
Date:   Fri Nov 21 14:40:34 2014 +0100

    Merge branch 'clientdev' of github.com:owncloud/documentation into clientdev
    
    Conflicts:
    	developer_manual/ios_library/index.rst


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