merge from github
authormh <mh@immerda.ch>
Tue, 10 Apr 2012 12:57:32 +0000 (14:57 +0200)
committermh <mh@immerda.ch>
Tue, 10 Apr 2012 12:57:32 +0000 (14:57 +0200)
commitf06092dda9280b373f7a55dd11b650c729059151
tree44de4b06a7c695249a647cc71d515031568cf627
parentf2a0d2623b36e6105f31e51d99cbd349adaa30d7
parentc49190c6c6cae7c7f854920667717dad2e3adb27
merge from github
manifests/plugin/deploy.pp