Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sat, 21 Feb 2015 21:14:28 +0000 (13:14 -0800)
committerIvan Kohler <ivan@freeside.biz>
Sat, 21 Feb 2015 21:14:28 +0000 (13:14 -0800)

Trivial merge