OSDN Git Service

Merge branch 'master' into local
authorMichiro Hibari <hibari@users.sourceforge.jp>
Fri, 7 Jan 2011 01:23:29 +0000 (10:23 +0900)
committerMichiro Hibari <hibari@users.sourceforge.jp>
Fri, 7 Jan 2011 01:23:29 +0000 (10:23 +0900)
commit2aa6419c1863d0c5485ee92e3ac24ccfe93ad387
treef3ac998252037464b9f5caaaa069bee76a7c870d
parent10dc7242fb86e98e5c293ea9de0fd96a7b57e659
parentd8a4ebdfed30dbd7a53ca5adf1f30fb08174486f
Merge branch 'master' into local