Merge branch 'master' into develop
merging zh-tw and en-us, i18n/src/schedule.ls is the result. still need to patch schedule.jade and verify the process.
fixes #22 , add 2 more speaker bio
Merge branch 'develop' of https://github.com/g0v/summit.g0v.tw into develop
merge merger
update schedule.ls for merger
Merge branch 'develop' into dev/i18n/merge
Merge branch 'master' into dev/i18n/merge
let schedule use the new json format
remove unnecessary file: old json src and merger
merge schedule.ls: row_zh and row_en. only row is needed
tag is gone, fix it
merge master with develop
lang in index.jade for en-us should be 'en' from now on.
Merge branch 'develop'
regen for 34e57e8