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)
1  2 
manifests/defines/config_file.pp

Simple merge