Episode 15, interview xinzhi about 36kr.
Fix typo.
Fixed typo.
Merge pull request #6 from wolflee/master

Changing time format in feed
fix typo.
Merge branch 'master' of github.com:pragmaticly/teahour.fm
Use weibo insteand twitter.
Update xinzhi's Chinese name.
Episode 16. Shining Ray.
Update Shownote of 5/20
Episode 17.
New Episode: Databases with Eric Redmond
Merge branch 'master' of github.com:pragmaticly/teahour.fm

Conflicts:
	data/author.yml
Episode 19.
Episode 20.
typo.
Episode #21: 天使湾和天使投资
New Ep with kgen
kgen avatar url
Update 2013-07-09-gfw-and-vpncloud.html.markdown