Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sat, 18 Jan 2014 22:33:48 +0000 (14:33 -0800)
committerIvan Kohler <ivan@freeside.biz>
Sat, 18 Jan 2014 22:33:48 +0000 (14:33 -0800)

Trivial merge