Merge remote-tracking branch 'upstream/master'
commitfff96d360d25858833797e28822b877084bb1c95
authorVladimir Svyatski <v.unreal@gmail.com>
Wed, 9 Mar 2016 21:54:28 +0000 (10 00:54 +0300)
committerVladimir Svyatski <v.unreal@gmail.com>
Wed, 9 Mar 2016 21:54:28 +0000 (10 00:54 +0300)
treed00ea8b2048f0cd6e3f272c31799cb9d8fcb9ed8
parentefe7f1812cddb477f5e8147820902c91101fd9bd
parentb354602eda550d9e4b6b63e942e4d10bad68846c
Merge remote-tracking branch 'upstream/master'