Merge remote branch 'nadir/master'

Browse source

Conflicts:
	manifests/init.pp

...

This commit is contained in:

intrigeri 2010-10-17 02:34:50 +02:00

parent 8cb562f87c 35bc5ea4db

commit 0d41016e4f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available