Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sun, 10 Aug 2014 02:38:12 +0000 (19:38 -0700)
committerIvan Kohler <ivan@freeside.biz>
Sun, 10 Aug 2014 02:38:12 +0000 (19:38 -0700)

Trivial merge