Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorJeremy Davis <jeremyd@freeside.biz>
Sat, 29 Nov 2014 21:11:48 +0000 (16:11 -0500)
committerJeremy Davis <jeremyd@freeside.biz>
Sat, 29 Nov 2014 21:11:48 +0000 (16:11 -0500)

Trivial merge