Merge branch 'master' of git.freeside.biz:/home/git/freeside
authorIvan Kohler <ivan@freeside.biz>
Sat, 11 May 2013 20:18:52 +0000 (13:18 -0700)
committerIvan Kohler <ivan@freeside.biz>
Sat, 11 May 2013 20:18:52 +0000 (13:18 -0700)

Trivial merge