Inline diff

王权利请求将inline_diff合并到master

Created by: vsizov

http://i.imgur.com/iRjil.png

合并请求报告