a quick script from Dave Snowden to automate the process of merging upstream changes
Merge branch 'master' of github.com:tansaku/LocalSupport