Automatic commit of package [pulp-puppet] release [2.5.0-0.12.beta].
Merge changelogs.
Merge branch '2.5-testing' into 2.5-dev