Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Mon, 2 Feb 2015 09:34:59 +0000 (01:34 -0800)
committerIvan Kohler <ivan@freeside.biz>
Mon, 2 Feb 2015 09:34:59 +0000 (01:34 -0800)
1  2 
httemplate/edit/quick-charge.html

Simple merge