Merge branch 'master' of git.freeside.biz:/home/git/freeside

diff --combined httemplate/docs/license.html
index 18a84e8,94a8732..3f80570
--- 1/httemplate/docs/license.html
--- 2/httemplate/docs/license.html
+++ b/httemplate/docs/license.html
@@@ -63,7 -63,7 +63,7 @@@ GmbH, licensed under the terms of the G
  <P>
  Latex invoice template based on a template from eBills
  <http://ebills.sourceforge.net/> by Mark Asplen-Taylor <mark@asplen.co.uk>,
 -licensed under the terms fo the GNU GPL.
 +licensed under the terms of the GNU GPL.
  
  <P>
  Contains "JS Calendar" <http://dynarch.com/mishoo/calendar.epl>
@@@ -143,5 -143,11 +143,11 @@@ Contains icons fro
  by Mark James, licensed under the terms of the Creative Commons Attribution
  2.5 License.
  
+ <P>
+ Includes icon from 
+ http://www.iconarchive.com/show/oxygen-icons-by-oxygen-icons.org/Actions-document-edit-icon.html
+ licensed under GNU Lesser General Public License
+ </P>
+ 
  </BODY>
  </HTML>