Merge proposals dependent on lp://staging/~timkuhlman/charms/trusty/postgresql/nagios-fix

lp://staging/~timkuhlman/charms/trusty/postgresql/nagios-fix has no merge proposals.