OSDN Git Service

Merge branch 'master' into convertToSwift
authormasakih <masakih@users.sourceforge.jp>
Thu, 22 Dec 2016 13:18:38 +0000 (22:18 +0900)
committermasakih <masakih@users.sourceforge.jp>
Thu, 22 Dec 2016 13:18:38 +0000 (22:18 +0900)

Trivial merge