[Pkg-owncloud-commits] [owncloud-doc] 04/05: Merge tag 'upstream/0_20140421'

[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 a5d7c38a4dfeca91497a12a0266cff97846397b6
Merge: fbdc834 ce46c5f
Author: David Prévot <taffit at debian.org>
Date:   Mon Apr 21 12:16:17 2014 -0400

    Merge tag 'upstream/0_20140421'
    
    Upstream version 0~20140421

 admin_manual/configuration/auth_ldap.rst | 65 ++++++++++++++++----------------
 1 file changed, 32 insertions(+), 33 deletions(-)

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