OSDN Git Service

Merge branch 'branch_0.13.0'
authorAtsushi Konno <konn@users.sourceforge.jp>
Fri, 10 Apr 2009 11:51:23 +0000 (20:51 +0900)
committerAtsushi Konno <konn@users.sourceforge.jp>
Fri, 10 Apr 2009 11:51:23 +0000 (20:51 +0900)
Conflicts:
src/chxj_jhtml.c


Trivial merge