Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Mon, 9 Dec 2013 22:43:43 +0000 (14:43 -0800)
committerIvan Kohler <ivan@freeside.biz>
Mon, 9 Dec 2013 22:43:43 +0000 (14:43 -0800)

Trivial merge