config: merged again after reverted revno 1031
config: merged again after reverted revno 1031

wwitzel3/charm,wwitzel3/charm,makyo/charm,makyo/charm,ericsnowcurrently/juju-charm,wwitzel3/juju-charm,ericsnowcurrently/juju-charm,ericsnowcurrently/juju-charm,wwitzel3/juju-charm,rogpeppe/charm,wwitzel3/charm,wwitzel3/juju-charm,makyo/charm