Merge branch 'master' of git://git.gag.com/fw/altos