Merge branch 'master' into restore-e-sources
commit08519fbf12e3f0a748f81550ddfb54703f3207b5
authorWang Xuerui <idontknw.wang@gmail.com>
Thu, 5 May 2016 06:00:41 +0000 (5 14:00 +0800)
committerWang Xuerui <idontknw.wang@gmail.com>
Thu, 5 May 2016 06:00:41 +0000 (5 14:00 +0800)
tree2574c9e2fdb493882917748970eb191dc5c3a0cd
parentc0a51aa6d4b9b0e05878bc612f99926a7d0391b2
parent76cec18fc0808a92160ecd5e521fef0ee5a582dd
Merge branch 'master' into restore-e-sources