From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 27 Feb 2013 09:50:24 +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=1d0f88642d94e7bbc4861c7c08290967794883b3

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

1d0f88642d94e7bbc4861c7c08290967794883b3