Merge branch 'michal1106-patch-1'
authorCheng Zhao <zcbenz@gmail.com>
Tue, 26 Apr 2016 01:24:57 +0000 (10:24 +0900)
committerCheng Zhao <zcbenz@gmail.com>
Tue, 26 Apr 2016 01:24:57 +0000 (10:24 +0900)
commitdb91adc2e8777d8706434666605b291b755a4835
tree60e9642f4d1cf44e0b1d295686cf74fe9d1e577b
parent63d0704490b7fff63c8c0f5970f15b88c224fcfd
parenta0c14eed046f9a4c4813be28da4512ccdc49687a
Merge branch 'michal1106-patch-1'