From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 2 Jul 2012 21:24:21 +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=85e677b86fc37c54e6de2b06340351a28f5a5916

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

85e677b86fc37c54e6de2b06340351a28f5a5916