Merge proposals dependent on lp://staging/~jamesbeedy/charms/trusty/puppet-server/trunk

lp://staging/~jamesbeedy/charms/trusty/puppet-server/trunk has no merge proposals.