Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Tue, 17 Dec 2013 00:53:23 +0000 (16:53 -0800)
committerIvan Kohler <ivan@freeside.biz>
Tue, 17 Dec 2013 00:53:23 +0000 (16:53 -0800)

Trivial merge