Ossi Herrala 2e15368940 Merge branch 'master' of https://bitbucket.org/tmakinen/puppet ... Conflicts: python/manifests/init.pp		2012-04-02 12:54:32 +00:00
..
init.pp	Merge branch 'master' of https://bitbucket.org/tmakinen/puppet	2012-04-02 12:54:32 +00:00