Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sat, 12 Jul 2014 22:51:43 +0000 (15:51 -0700)
committerIvan Kohler <ivan@freeside.biz>
Sat, 12 Jul 2014 22:51:43 +0000 (15:51 -0700)

Trivial merge