Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Thu, 16 Jan 2014 06:17:36 +0000 (22:17 -0800)
committerIvan Kohler <ivan@freeside.biz>
Thu, 16 Jan 2014 06:17:36 +0000 (22:17 -0800)

Trivial merge