From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 2 Dec 2013 01:25:30 +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=ec02246ea0218838def2b12b0b987f71662d1761

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

ec02246ea0218838def2b12b0b987f71662d1761