Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 9 Jul 2014 00:44:38 +0000 (17:44 -0700)
committerIvan Kohler <ivan@freeside.biz>
Wed, 9 Jul 2014 00:44:38 +0000 (17:44 -0700)

Trivial merge