OSDN Git Service

Merge branch 'v3.1.2-devel' v3.1.2-1
authorroot <root@um01rh6.(none)>
Fri, 5 Jun 2015 01:51:29 +0000 (10:51 +0900)
committerroot <root@um01rh6.(none)>
Fri, 5 Jun 2015 01:51:29 +0000 (10:51 +0900)

Trivial merge