git remote add coreycb-l1 git://git.launchpad.net/~corey.bryant/ubuntu/+source/heat/+git/liberty-1
git fetch coreycb-l1
git checkout upstream
git merge coreycb-l1/upstream
git checkout pristine-tar 
git merge coreycb-l1/pristine-tar 
git checkout master 
git merge coreycb-l1/master