Merge remote-tracking branch 'origin/master'

dzungdo · May 28, 2013 · 045e081 · 045e081
2 parents 2319200 + 0308830
commit 045e081
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/installer_puppet/puppet-foreman b/installer_puppet/puppet-foreman
diff --git a/installer_puppet/puppet-foreman_proxy b/installer_puppet/puppet-foreman_proxy