Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Tue, 3 Jun 2014 19:14:49 +0000 (12:14 -0700)
committerIvan Kohler <ivan@freeside.biz>
Tue, 3 Jun 2014 19:14:49 +0000 (12:14 -0700)

Trivial merge