daily: 20141211
Merge branch 'master' of github.com:biangbiang/daily