From: Andrew DeFaria <Andrew@DeFaria.com>
Date: Tue, 4 Aug 2015 19:49:35 +0000 (-0700)
Subject: Merge branch 'master' of /opt/git/clearscm
X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=741c2b2cf2529abe150429f0f9ccd5f4f9b19c90;p=clearscm.git

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

Conflicts:
	web/Resumes/Andrew/index.php
---

741c2b2cf2529abe150429f0f9ccd5f4f9b19c90