How to update a git fork

git remote add upstream https://github.com/mxcube/mxcube.git
git fetch --all
git checkout master
git merge upstream/master
git push origin master

More info: http://stackoverflow.com/questions/7244321/how-to-update-a-github-forked-repository