Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sat, 11 Jan 2014 00:48:41 +0000 (16:48 -0800)
committerIvan Kohler <ivan@freeside.biz>
Sat, 11 Jan 2014 00:48:41 +0000 (16:48 -0800)

Trivial merge