OSDN Git Service

Merge with stable
authorsdottaka <sdottaka@users.sourceforge.net>
Thu, 27 Nov 2014 11:20:26 +0000 (20:20 +0900)
committersdottaka <sdottaka@users.sourceforge.net>
Thu, 27 Nov 2014 11:20:26 +0000 (20:20 +0900)
commit7b447c4c479d95bc8378684ca40e0f0dd742aefe
treea2a5cb87ec4eb903d22e8d1d946de2d9b682cec4
parenta6103876b5f01571cea9e8996cc94349fd98deef
parent830240d01798d7551f7a9c24b657503bbdd094de
Merge with stable