From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 9 Nov 2013 20:03:52 +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=0c04fc78f66d17a5736686757cd8f838715c8380

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

0c04fc78f66d17a5736686757cd8f838715c8380