OSDN Git Service

Merge branch 'session_handler_configure'
authorSotaro KARASAWA <sotarok@users.sourceforge.jp>
Fri, 20 Nov 2009 15:37:00 +0000 (00:37 +0900)
committerSotaro KARASAWA <sotarok@users.sourceforge.jp>
Fri, 20 Nov 2009 15:37:00 +0000 (00:37 +0900)
commit655929bf77500aec179fa7396cc21a1bd64833ff
tree22730fce573ab6bc020c33b4191e396ef94208b9
parentf6b514777dbe1162c3d3b65ae8d39f79066930c0
parentb458af506ca102611d06603144fc2d421adf1d24
Merge branch 'session_handler_configure'

Conflicts:

CHANGES -- 両方を追記してマージ
CHANGES