Merge remote-tracking branch 'upstream/master'
commit9f39a83a66331fa36e1f8f322d1a8102a7be6701
authorVladimir Svyatski <v.unreal@gmail.com>
Wed, 6 Jan 2016 22:26:50 +0000 (7 01:26 +0300)
committerVladimir Svyatski <v.unreal@gmail.com>
Wed, 6 Jan 2016 22:26:50 +0000 (7 01:26 +0300)
tree1cc874240808b9de825f850a05346e16dc8276aa
parent441d593197e39e50bd5c0acc5a5f48cbb49ba1ef
parent8615ff1fc0e8856088446c6da9cf4c65678ed9eb
Merge remote-tracking branch 'upstream/master'