From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 13 Nov 2015 21:06:00 +0000 (-0800)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=2d3ab45cd0b35cb929198e2ad36a1ec9a3b4d93d;hp=-c

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

2d3ab45cd0b35cb929198e2ad36a1ec9a3b4d93d
diff --combined httemplate/docs/license.html
index 18a84e8c6,94a8732e5..3f80570d9
--- a/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>