Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Tue, 23 Dec 2014 20:19:30 +0000 (12:19 -0800)
committerIvan Kohler <ivan@freeside.biz>
Tue, 23 Dec 2014 20:19:30 +0000 (12:19 -0800)

Trivial merge