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

Trivial merge