From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 15 Aug 2012 20:58:13 +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=372b4a5284387258a5fbfcef791597f2964917e7

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

372b4a5284387258a5fbfcef791597f2964917e7