From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 19 Jun 2013 22:29:55 +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=a6dd5bc6ba6c655b1707a016db4e97e269b718e5

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

a6dd5bc6ba6c655b1707a016db4e97e269b718e5