Micah Anderson 233229435f Merge remote-tracking branch 'sarava/master' ... Conflicts: manifests/defines/line.pp manifests/defines/module_dir.pp manifests/defines/module_file.pp manifests/init.pp		2011-03-25 00:59:48 -04:00
..
defines	Merge remote-tracking branch 'sarava/master'	2011-03-25 00:59:48 -04:00
moduledir	refactoring the last part of moduledirs	2010-09-02 18:17:35 -04:00
init.pp	Merge remote branch 'immerda/master'	2010-09-02 19:04:29 -04:00
moduledir.pp	remove unnecessary fileserver variable (#2460)	2010-09-02 18:29:17 -04:00