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=f587b6ad9db3e9e77313b84426649f6dcb9dae99;p=clearscm.git

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

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

f587b6ad9db3e9e77313b84426649f6dcb9dae99