Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Tue, 18 Jun 2013 22:26:02 +0000 (15:26 -0700)
committerIvan Kohler <ivan@freeside.biz>
Tue, 18 Jun 2013 22:26:02 +0000 (15:26 -0700)

Trivial merge