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