Merge branch 'NKMR6194-master'
authorCheng Zhao <zcbenz@gmail.com>
Mon, 20 Apr 2015 11:40:37 +0000 (19:40 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Mon, 20 Apr 2015 11:40:37 +0000 (19:40 +0800)
commit2814dc316af8df1cfdaeb34c699d1f8674aef1b7
treed1862127fa2e8cf3dc5c04da5db261fe96280a8c
parent237b7bedaaf7d0fa335a54a17bd7db8131e984a8
parentfc3026dcfeffddc4f708cb878bb1259092518f6c
Merge branch 'NKMR6194-master'