config: merged trunk before propose
config: merged trunk before propose

bz2/juju,rogpeppe/juju,ericsnowcurrently/juju,AdamIsrael/juju,reedobrien/juju,perrito666/juju,kat-co/juju,alesstimec/juju,mjs/juju,thomnico/juju,mhilton/juju-juju,waigani/juju,macgreagoir/juju,reedobrien/juju,bac/juju,makyo/juju,mhilton/juju-juju,mhilton/juju,anastasiamac/juju,Altoros/juju-vmware,anastasiamac/juju,frankban/juju,bz2/juju,mjs/juju,marcmolla/juju,macgreagoir/juju,marcoceppi/juju,bac/juju,frankban/juju-tmp,alesstimec/juju,fwereade/juju,marcmolla/juju,howbazaar/juju,kat-co/juju,AdamIsrael/juju,davecheney/juju,AdamIsrael/juju,tych0/juju,kat-co/juju,bac/juju,ericsnowcurrently/juju,bogdanteleaga/juju,voidspace/juju,frankban/juju-tmp,fwereade/juju,Altoros/juju-cloudsigma,mattyw/juju,Altoros/juju-cloudsigma,macgreagoir/juju,tsakas/juju,tasdomas/juju,dimitern/juju,axw/juju,gabriel-samfira/juju,jrwren/juju,marcmolla/juju,thomnico/juju,reedobrien/store,bz2/juju,makyo/juju,howbazaar/juju,anastasiamac/juju,gabriel-samfira/juju,axw/juju,mikemccracken/juju,thomnico/juju,jrwren/juju,tych0/juju,waigani/juju,voidspace/juju,Altoros/juju-cloudsigma,anastasiamac/juju,Altoros/juju-vmware,jrwren/juju,alesstimec/juju,mattyw/juju,dimitern/juju,cloud-green/juju,dimitern/juju,marcmolla/juju,reedobrien/juju,ericsnowcurrently/juju,mjs/juju,perrito666/juju,dooferlad/juju,bogdanteleaga/juju,frankban/juju,Altoros/juju-cloudsigma,frankban/juju,sinzui/juju,bogdanteleaga/juju,ericsnowcurrently/juju,axw/juju,thomnico/juju,mikemccracken/juju,rogpeppe/juju,tych0/juju,wwitzel3/juju,macgreagoir/juju,mhilton/juju,bac/juju,mjs/juju,cmars/juju,macgreagoir/juju,dooferlad/juju,mjs/juju,cherylj/juju,alesstimec/juju,anastasiamac/juju,howbazaar/juju,waigani/juju,gabriel-samfira/juju,frobware/juju,wwitzel3/juju,dooferlad/juju,dimitern/juju,mattyw/juju,mhilton/juju,davecheney/juju,frankban/juju,mikemccracken/juju,bz2/juju,tsakas/juju,gabriel-samfira/juju,davecheney/juju,kat-co/juju,alesstimec/juju,wwitzel3/juju,bz2/juju,sinzui/juju,mhilton/juju-juju,makyo/juju,tasdomas/juju,gabriel-samfira/juju,howbazaar/juju,perrito666/juju,marcoceppi/juju,voidspace/juju,frobware/juju,dooferlad/juju,cmars/juju,mhilton/juju-juju,dooferlad/juju,fwereade/juju,cherylj/juju,perrito666/juju,axw/juju,axw/juju,marcoceppi/juju,davecheney/juju,mattyw/juju,howbazaar/juju,cmars/juju,cherylj/juju,wwitzel3/juju,mikemccracken/juju,tasdomas/juju,tsakas/juju,perrito666/juju,cmars/juju,frankban/juju-tmp,cloud-green/juju,mhilton/juju,dimitern/juju,marcoceppi/juju,tasdomas/juju,frankban/juju,mjs/juju,ericsnowcurrently/juju,rogpeppe/juju,AdamIsrael/juju,fwereade/juju,cloud-green/juju,sinzui/juju,mjs/juju,reedobrien/juju,reedobrien/juju,bac/juju,tsakas/juju,Altoros/juju-vmware,kat-co/juju,frobware/juju,tych0/juju,voidspace/juju,waigani/juju,cloud-green/juju,Altoros/juju-vmware,makyo/juju,bogdanteleaga/juju,cherylj/juju,mikemccracken/juju,sinzui/juju,frankban/juju-tmp,marcmolla/juju