Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 19 Jun 2013 22:29:55 +0000 (15:29 -0700)
committerIvan Kohler <ivan@freeside.biz>
Wed, 19 Jun 2013 22:29:55 +0000 (15:29 -0700)

Trivial merge