[system-administrators-guide: 2/2] Merge branch 'master' of ssh://git.fedorahosted.org/git/docs/system-administrators-guide

[stephenw]

commit ac355c11727fe70d4bc43184ad33133f124fb330
Merge: 7d7283a 6331af2
Author: Stephen Wadeley <swadeley at redhat.com>
Date:   Wed Jul 10 10:30:24 2013 +0200

    Merge branch 'master' of ssh://git.fedorahosted.org/git/docs/system-administrators-guide
    
    Conflicts:
    	en-US/Configuring_NTP_using_the_Chrony_suite.xml

---