OSDN Git Service

Merge remote-tracking branch 'upstream/master'
authorVladimir Svyatski <v.unreal@gmail.com>
Wed, 27 Apr 2016 20:50:27 +0000 (23:50 +0300)
committerVladimir Svyatski <v.unreal@gmail.com>
Wed, 27 Apr 2016 20:50:27 +0000 (23:50 +0300)

Trivial merge