Merge remote-tracking branch 'upstream/master'
commit9893117761ddceef30f46971c32624fa302523c3
authorVladimir Svyatski <v.unreal@gmail.com>
Wed, 13 Apr 2016 21:21:42 +0000 (14 00:21 +0300)
committerVladimir Svyatski <v.unreal@gmail.com>
Wed, 13 Apr 2016 21:21:42 +0000 (14 00:21 +0300)
treee5aa1d1d1e1c015dde31e712e29cd3f716fa897b
parent825b3417ef29bdcf37943da233e2ec4cc70dc723
parentb6b0413e8668e82824096134c0a27623bfc611cf
Merge remote-tracking branch 'upstream/master'