From: Ivan Kohler <ivan@freeside.biz>
Date: Sun, 20 Oct 2013 05:31:58 +0000 (-0700)
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=ecc15d03711690d2b2aeeda2bd8ff1119956c583

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

ecc15d03711690d2b2aeeda2bd8ff1119956c583