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

Trivial merge