[Pkg-owncloud-commits] [owncloud-doc] 36/49: Merge pull request #233 from DavidPrevot/iana

[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 58d55966e0d69598b6158f05d1642a5f49b18e3e
Merge: e23388c 0a01ef4
Author: Frank Karlitschek <frank at owncloud.org>
Date:   Sat Jan 11 06:27:51 2014 -0800

    Merge pull request #233 from DavidPrevot/iana
    
    Use a IANA-managed reserved domain for examples

 user_manual/files/files.rst  | 32 ++++++++++++++++----------------
 user_manual/pim/contacts.rst |  4 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)

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