Merge branch 'master' into openstack-os-build
Merge remote-tracking branch 'origin/openstack-os-build' into openstack-os-build
Merge branch 'master' into openstack-os-build
Merge remote-tracking branch 'origin/openstack-os-build' into openstack-os-build
Merge branch 'master' into openstack-os-build
Merge remote-tracking branch 'origin/openstack-os-build' into openstack-os-build
Merge remote-tracking branch 'origin/openstack-os-build' into openstack-os-build
Merge branch 'master' into openstack-os-build
Merge remote-tracking branch 'origin/openstack-os-build' into openstack-os-build
Merge remote-tracking branch 'origin/openstack-os-build' into openstack-os-build
Merge remote-tracking branch 'origin/openstack-os-build' into openstack-os-build
Merge remote-tracking branch 'origin/openstack-os-build' into openstack-os-build
Merge branch 'master' into openstack-os-build
Eschew barclamp merge conflicts.
Merge branch 'release/rails3anddb/openstack-os-build' into openstack-os-build
Move barclamp submodule refs back.
Merge branch 'master' into openstack-os-build
Merge branch 'master' into openstack-os-build
Add updated submodule references for openstack-os-build
Merge pull request #1484 from galthaus/pull-req-openstack-os-build-14517d070f

Merge rails3anddb into development [28/29]