Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 16 Jul 2014 13:19:30 +0000 (06:19 -0700)
committerIvan Kohler <ivan@freeside.biz>
Wed, 16 Jul 2014 13:19:30 +0000 (06:19 -0700)

Trivial merge