Added by city stats
Merge branch 'master' of github.com:hcking/hcking
Merge branch '69/add_microformat_data' of https://github.com/thegcat/hcking into thegcat-69/add_microformat_data
Merge branch 'master' of github.com:hcking/hcking