OSDN Git Service

merge develop
authorOlyutorskii <olyutorskii@users.osdn.me>
Sun, 9 Apr 2017 09:14:24 +0000 (18:14 +0900)
committerOlyutorskii <olyutorskii@users.osdn.me>
Sun, 9 Apr 2017 09:14:24 +0000 (18:14 +0900)
commitb0b344c6f641c06bb8fa88f4a4127cd5cc6943bf
tree6c70eb89045cb08f5689425c1ea0d75c31cdb030
parentacd985725fd98ad51ba5585b0766ca45e73dd570
parentd60b5edab66e0ac28d55c9833aab4c998216d630
merge develop