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