Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 25 Sep 2013 22:57:13 +0000 (15:57 -0700)
committerIvan Kohler <ivan@freeside.biz>
Wed, 25 Sep 2013 22:57:13 +0000 (15:57 -0700)

Trivial merge