OSDN Git Service

Merge branch 'master' into kitagawa_test
authorHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Mon, 11 May 2015 14:25:00 +0000 (23:25 +0900)
committerHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Mon, 11 May 2015 14:25:00 +0000 (23:25 +0900)
commit9ea8f9cbe5824b0642cd6f3a74a31cf81af96ed4
treecdff531bfce6962cee458c2d70294f898e12bc07
parentc060aa3b369a0b1a113fcb43167a3b6340e1fda7
parentbc7d2da9411cd3c3fcc6838677eabd734e50f9af
Merge branch 'master' into kitagawa_test