From: Ivan Kohler <ivan@freeside.biz>
Date: Sun, 11 Aug 2013 23:18:24 +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=35e5b12fb55f229edd16bed66e21c5806b8d3b7e

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

35e5b12fb55f229edd16bed66e21c5806b8d3b7e