Merge remote-tracking branch 'leap/parameterized_classes'
authorvarac <varacanero@zeromail.org>
Fri, 14 Jun 2013 17:47:07 +0000 (19:47 +0200)
committervarac <varacanero@zeromail.org>
Fri, 14 Jun 2013 17:47:07 +0000 (19:47 +0200)
commit8a54ee6ff08c7b498e8da8f5e8ca6827c4d0ff58
tree724e8d8fbb9970a5f1f420bd36fbd410a45b6bfc
parent65dc795b3f2ec99a08b652c2b59555235dbca48b
parent1e6fbdf7f1f7e381ef01170eab96727377abe3b6
Merge remote-tracking branch 'leap/parameterized_classes'

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