Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 24 Apr 2013 07:00:13 +0000 (00:00 -0700)
committerIvan Kohler <ivan@freeside.biz>
Wed, 24 Apr 2013 07:00:13 +0000 (00:00 -0700)

Trivial merge