From: Ivan Kohler <ivan@freeside.biz>
Date: Sun, 17 Nov 2013 23:56:38 +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=0076a0d790d1385cd2a16472ec2c11528edbc9e3

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

0076a0d790d1385cd2a16472ec2c11528edbc9e3