tree 6f09d1b439fca07bd03a6375440a1233282b22eb
parent 23660f8e9253ceafa89bd8ae568bf93c5b6c6619
parent 3742c1a00c5602154a81834443ec5b0ca32c4ca0
author mh <mh@immerda.ch> 1357125829 +0100
committer mh <mh@immerda.ch> 1357125829 +0100

Merge remote-tracking branch 'shared/master'

Conflicts:
	manifests/init.pp