Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 7 Aug 2013 19:05:53 +0000 (12:05 -0700)
committerIvan Kohler <ivan@freeside.biz>
Wed, 7 Aug 2013 19:05:53 +0000 (12:05 -0700)

Trivial merge