Merge remote-tracking branch 'upstream/master'
commitefe7f1812cddb477f5e8147820902c91101fd9bd
authorVladimir Svyatski <v.unreal@gmail.com>
Wed, 10 Feb 2016 21:20:36 +0000 (11 00:20 +0300)
committerVladimir Svyatski <v.unreal@gmail.com>
Wed, 10 Feb 2016 21:20:36 +0000 (11 00:20 +0300)
tree1d80eddf777adb5189610ef61a2b702487296d35
parent909a1813216c202d3a528d42742d8fd7cc84cbed
parentcc0566476105ef7092c29874e96c23e2a27b51a3
Merge remote-tracking branch 'upstream/master'