Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sat, 4 May 2013 07:21:14 +0000 (00:21 -0700)
committerIvan Kohler <ivan@freeside.biz>
Sat, 4 May 2013 07:21:14 +0000 (00:21 -0700)

Trivial merge