Merge branch 'master' into openstack-os-build

crowbar · Mar 25, 2012 · 518a7f5 · 518a7f5
2 parents 8b388f6 + 55cb483
commit 518a7f5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/barclamps/crowbar b/barclamps/crowbar
diff --git a/barclamps/provisioner b/barclamps/provisioner