Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 29 Jan 2014 21:58:25 +0000 (13:58 -0800)
committerIvan Kohler <ivan@freeside.biz>
Wed, 29 Jan 2014 21:58:25 +0000 (13:58 -0800)

Trivial merge