Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorJeremy Davis <jeremyd@freeside.biz>
Fri, 5 Dec 2014 14:50:06 +0000 (09:50 -0500)
committerJeremy Davis <jeremyd@freeside.biz>
Fri, 5 Dec 2014 14:50:06 +0000 (09:50 -0500)

Trivial merge