OSDN Git Service

Merge branch 'jp2014.1' into jpnext
authorTakuya Nishimoto <nishimotz@gmail.com>
Mon, 3 Mar 2014 01:32:35 +0000 (10:32 +0900)
committerTakuya Nishimoto <nishimotz@gmail.com>
Mon, 3 Mar 2014 01:32:35 +0000 (10:32 +0900)
commit1a4f079b09255ffa128bc6631e6a0701d93bb65f
treed25f4263671e1dbec0f2ed2cb5f4af274af441f1
parent185707c673f01c8c2af53d30194a7f2dc57e12e9
parent79f908db9dbfc809e30dc1a9da8945f6b241cd90
Merge branch 'jp2014.1' into jpnext