Merge remote-tracking branch 'upstream/master'
commit825b3417ef29bdcf37943da233e2ec4cc70dc723
authorVladimir Svyatski <v.unreal@gmail.com>
Wed, 23 Mar 2016 21:28:43 +0000 (24 00:28 +0300)
committerVladimir Svyatski <v.unreal@gmail.com>
Wed, 23 Mar 2016 21:28:43 +0000 (24 00:28 +0300)
tree6450a1581da60a93834a28bbf3d78496302f868e
parentfff96d360d25858833797e28822b877084bb1c95
parentbd0bec6b6f46a64e9a6caf8bbe24863d02a3229d
Merge remote-tracking branch 'upstream/master'