Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Fri, 13 Nov 2015 21:06:00 +0000 (13:06 -0800)
committerIvan Kohler <ivan@freeside.biz>
Fri, 13 Nov 2015 21:06:00 +0000 (13:06 -0800)
1  2 
httemplate/docs/license.html

Simple merge