Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 3 Jul 2013 03:02:42 +0000 (20:02 -0700)
committerIvan Kohler <ivan@freeside.biz>
Wed, 3 Jul 2013 03:02:42 +0000 (20:02 -0700)

Trivial merge