From: Andrew <Andrew@ClearSCM.com>
Date: Fri, 20 Jun 2014 14:50:42 +0000 (-0700)
Subject: Merge branch 'master' of defaria.com:/opt/git/clearscm
X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=f4e413372689070144d3418c3403ac37a89bfc02;hp=-c;p=clearscm.git

Merge branch 'master' of defaria.com:/opt/git/clearscm
---

f4e413372689070144d3418c3403ac37a89bfc02
diff --combined maps/register.html
index fb2c615,8e98561..17b5503
--- a/maps/register.html
+++ b/maps/register.html
@@@ -17,7 -17,7 +17,7 @@@ Permission System</font></h1
  email click <a
  href="http://defaria.com/maps/bin/registerform.cgi?userid=$userid;sender=$sender">here</a></b></font>
  
- <p>For your convience you email message is attached to this
+ <p>For your convenience you email message is attached to this
  message. Note that if you register your previous emails will be
  delivered therefore you do not need to resend the message that is
  attached to this one.
@@@ -51,7 -51,7 +51,7 @@@ likely move you to my <i>black list</i>
  
  <div class="copyright">
  
 -Copyright &copy; 2001-2013 - All rights reserved<br>
 +Copyright &copy; 2001-2014 - All rights reserved<br>
  
  <a href="http://defaria.com/">Andrew DeFaria</a> <a
  href="mailto:Andrew@DeFaria.com">&lt;Andrew@DeFaria.com&gt;</a>