Merge branch 'master' of /opt/git/clearscm
authorAndrew DeFaria <Andrew@DeFaria.com>
Tue, 4 Aug 2015 19:49:35 +0000 (12:49 -0700)
committerAndrew DeFaria <Andrew@DeFaria.com>
Tue, 4 Aug 2015 19:49:35 +0000 (12:49 -0700)
commitf587b6ad9db3e9e77313b84426649f6dcb9dae99
tree40582b9e8387c5d8a7081d0acce1eb8abdfe52f0
parentfbfd2db9e9b8c77f9bc226d22bb9e4f535ce8e94
parent758be15a0797ed5700ffb7315902c1197266e3ff
Merge branch 'master' of /opt/git/clearscm

Conflicts:
web/Resumes/Andrew/index.php