Merging gecko dev into master - Mardak/tiles-dev GitHub Wiki

Merging gecko-dev into master

git checkout master  
### set up the gecko remote if needed
git remote add gecko-dev [email protected]:mozilla/gecko-dev.git
###  fetch the master
git fetch gecko-dev  master
### merge fetch head
git merge fetch_head 
git push origin master 

forces remote bug986521 to be the local master

git push origin master:bug986521 -f