From: Andrew DeFaria <Andrew@DeFaria.com>
Date: Mon, 9 Dec 2013 18:00:32 +0000 (-0800)
Subject: Merge branch 'master' of /opt/git/clearscm
X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=37af5419f8e76617039f538f32ed35e2b17cbb68;p=clearscm.git

Merge branch 'master' of /opt/git/clearscm

Conflicts:
	web/Resumes/Andrew/Resume.doc
---

37af5419f8e76617039f538f32ed35e2b17cbb68