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)
commitc5dfe971ffbb513dfd972bfc6c78c4b8e75f1b2f
treec33ce7e76df1d32914e599668f0458b9e168bb10
parent261f625f96c1fba9e6addfac7e0f686218bcef1a
parent7132b467e1d718a052b301189b6a502f557d1d81
Merge branch 'v3.1.2-devel'