Commit ce65e14d151f03066320be8da1d851ea896caacf

Con Kolivas 2012-04-23T01:56:21

Merge pull request #174 from kanoi/master Ensure everyone sees the same screen/api name as the previous version