]> Vexing Labs - resume.git/commitdiff
Merge branch 'master' of https://github.com/coyote240/resume
authorAdam A. G. Shamblin <adam.shamblin@gmail.com>
Wed, 22 Jan 2014 15:42:37 +0000 (08:42 -0700)
committerAdam A. G. Shamblin <adam.shamblin@gmail.com>
Wed, 22 Jan 2014 15:42:37 +0000 (08:42 -0700)
1  2 
README.md

diff --cc README.md
Simple merge