Merge pull request #3270 from preco21/master
authorCheng Zhao <zcbenz@gmail.com>
Fri, 30 Oct 2015 02:24:48 +0000 (10:24 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Fri, 30 Oct 2015 02:24:48 +0000 (10:24 +0800)
commit28fb0d0e925f7d433f22e423e7ba1a9fb9fe2d93
tree95fb71a000abb8f3795a8df22811b740336c09a3
parent386325915b9c92117f45e4a551f3cc044329a8a6
parent72e8660245a0780a9046ad2b7f230d3233ffdb72
Merge pull request #3270 from preco21/master

Update as upstream