sync history to 2013-5-14

Signed-off-by: Zhengwang Ruan <ruan.zhengwang@gmail.com>