From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 25 Sep 2013 22:57: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=f2766e203e1aa144d046a26cf13e01e1f5b00f64;hp=-c

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

f2766e203e1aa144d046a26cf13e01e1f5b00f64