latest 3 messages by thoraxe

+ [2014-10-10T22:48:57Z] thoraxe aha!@
+ [2014-10-10T22:48:56Z] thoraxe http://bradlyfeeley.com/2008/09/03/update-a-github-fork-from-the-original-repo/
+ [2014-10-10T22:46:02Z] thoraxe so, if i forked a repo, and the original repo's master has moved forwards, how do I bring my fork's master in-line with the latest upstream master?