Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 6 Aug 2014 22:36:56 +0000 (15:36 -0700)
committerIvan Kohler <ivan@freeside.biz>
Wed, 6 Aug 2014 22:36:56 +0000 (15:36 -0700)

Trivial merge