Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sun, 17 Nov 2013 23:56:38 +0000 (15:56 -0800)
committerIvan Kohler <ivan@freeside.biz>
Sun, 17 Nov 2013 23:56:38 +0000 (15:56 -0800)

Trivial merge