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)
commit899cf5029429c1183024cd4bf838573a951d0ede
treee49a56592b9086d8f816df75008bd0c79cc53083
parent91fc21ed01fec83bf1dbb7392d212acdffd4d44c
parent64514e0541c94b23a096acb265cb47e9ca6e6f85
Merge branch 'master' of git.freeside.biz:/home/git/freeside
httemplate/edit/quick-charge.html