Merge remote branch 'cmaisonneuve/master'
authorintrigeri <intrigeri@boum.org>
Wed, 10 Nov 2010 10:56:59 +0000 (11:56 +0100)
committerintrigeri <intrigeri@boum.org>
Wed, 10 Nov 2010 10:56:59 +0000 (11:56 +0100)
commit001bbc5ff82337e6ddc7b13fb337b43ed36d2dee
tree41360e2f8c9f200767168fedcc19e861cb091380
parent63a16ad8c07e880e68cb7c0a895f7e26ca1434f8
parent63322aa30578c69772d2f1e266a8534b12874a0f
Merge remote branch 'cmaisonneuve/master'
manifests/defines/config_file.pp