Merge branch 'master' of git://github.com/puppet-modules/puppet-commonmaster
commitb81750698bddcfcf86211c510104508afa9c9058
authorJames Richardson <james@jamesr.biz>
Sat, 24 Jul 2010 03:59:08 +0000 (23 23:59 -0400)
committerJames Richardson <james@jamesr.biz>
Sat, 24 Jul 2010 03:59:08 +0000 (23 23:59 -0400)
tree5f3510e724844f3952c19b726a6bf1af3295a39d
parentef71aec367ce5fabf807bc3d9c4757104b5224eb
parentba28f3004d402c250ef3099f95a1ae13740b009f
Merge branch 'master' of git://github.com/puppet-modules/puppet-common

Conflicts:
README
README