OSDN Git Service

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

Trivial merge