Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sun, 26 Jan 2014 01:25:36 +0000 (17:25 -0800)
committerIvan Kohler <ivan@freeside.biz>
Sun, 26 Jan 2014 01:25:36 +0000 (17:25 -0800)

Trivial merge