Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Wed, 27 Mar 2013 02:00:33 +0000 (19:00 -0700)
committerIvan Kohler <ivan@freeside.biz>
Wed, 27 Mar 2013 02:00:33 +0000 (19:00 -0700)

Trivial merge