Merge branch 'master' into namespaced
authorW. Trevor King <wking@tremily.us>
Fri, 29 Nov 2013 23:41:05 +0000 (15:41 -0800)
committerW. Trevor King <wking@tremily.us>
Fri, 29 Nov 2013 23:41:05 +0000 (15:41 -0800)
commit26aa42cca36f26c11304bab0c286f2ba451261bb
tree0d5b45fbacdd85a37480fb6193547569a31df73c
parent5b840457c557d9821008f2aaba749a2989d770df
parent69d18426ef42d6b1bb4518012edffda4c0a7f812
Merge branch 'master' into namespaced

* master:
  cheat-sheet.md: Fix 'Incorperate' -> 'Incorporate' typo
version-control/git/cheat-sheet.md