Merge branch 'patch-1' of git://github.com/BernhardKonrad/boot-camps into BernhardKon...
authorBen Waugh <b.waugh@ucl.ac.uk>
Thu, 11 Apr 2013 22:01:10 +0000 (23:01 +0100)
committerW. Trevor King <wking@tremily.us>
Fri, 1 Nov 2013 20:49:10 +0000 (13:49 -0700)
commit8c62a70408e42726b22ffc3c15648e97183c72a4
treea8655aeb706b12eae6599bdeba09eba883b2248e
parent74868a6154168fe83fd630fcf4a872217207aba9
parente2a36d0010f5475b493b045748675b2067e6c58e
Merge branch 'patch-1' of git://github.com/BernhardKonrad/boot-camps into BernhardKonrad-patch-1

Conflicts:
testing/cheat-sheet.md
testing/cheat-sheet.md