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

diff --combined httemplate/docs/license.html
index 91fbbe2,e473982..570f503
--- 1/httemplate/docs/license.html
--- 2/httemplate/docs/license.html
+++ b/httemplate/docs/license.html
@@@ -36,9 -36,7 +36,9 @@@ All rights reserved<BR
      option) any later version.
  
  <P>
 -    At your option, you may also redistribute and/or modify the
 +    At your option, you may also redistribute and/or modify the files in 
 +    fs_selfservice/drupal/ fs_selfservice/wordpress/ fs_selfservice/perl/ and
 +    fs_selfservice/java/ directories and the
      fs_selfservice/php/freeside.class.php file (but not the rest of the
      software) under the terms of the GNU Lesser General Public License as
      published by the Free Software Foundation, either version 3 of the License,
@@@ -148,6 -146,10 +148,10 @@@ under the terms of the MIT license
  Contains the form validation jQuery plugin <a href="https://jqueryvalidation.org/">jQuery Validation</a>  by Jörn Zaefferer, 
  licensed under the terms of MIT License.
  
+ <P>
+ Contains the leaflet JavaScript library <a href="http://leafletjs.com/">Leaflet JS</a>  by Vladimir Agafonkin,
+ licensed under the terms of MIT License.
+ 
  <!-- artwork -->
  
  <P>