Merge branch 'master' of git.onelab.eu:/git/nodeconfig
[nodeconfig.git] / PlanetLabConf / ntp / ntp.conf.ucdavis.edu