Merge branch 'master' of /opt/git/clearscm
authorAndrew DeFaria <Andrew@DeFaria.com>
Mon, 9 Dec 2013 18:00:32 +0000 (10:00 -0800)
committerAndrew DeFaria <Andrew@DeFaria.com>
Mon, 9 Dec 2013 18:00:32 +0000 (10:00 -0800)
commit37af5419f8e76617039f538f32ed35e2b17cbb68
tree3ddda85a6d48015d8f42f4926c31c3f798d4cbc1
parent8248df9281cfa0df2c5272590618d90077ef7009
parent298db9c940804c77707124b32132de41d864914f
Merge branch 'master' of /opt/git/clearscm

Conflicts:
web/Resumes/Andrew/Resume.doc