Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sat, 8 Jun 2013 06:41:46 +0000 (23:41 -0700)
committerIvan Kohler <ivan@freeside.biz>
Sat, 8 Jun 2013 06:41:46 +0000 (23:41 -0700)

Trivial merge