Merge remote-tracking branch 'shared/master' master
authormh <mh@immerda.ch>
Wed, 2 Jan 2013 11:23:49 +0000 (12:23 +0100)
committermh <mh@immerda.ch>
Wed, 2 Jan 2013 11:23:49 +0000 (12:23 +0100)
commitbac64e7595a6d4f8d409b024a26bddb1c06188d6
tree6f09d1b439fca07bd03a6375440a1233282b22eb
parent23660f8e9253ceafa89bd8ae568bf93c5b6c6619
parent3742c1a00c5602154a81834443ec5b0ca32c4ca0
Merge remote-tracking branch 'shared/master'

Conflicts:
manifests/init.pp
manifests/init.pp