Merge branch 'branch_0.13.0'

Conflicts:
	configure
	configure.ac
	include/config.h
	support/centos/mod-chxj.spec
	support/freebsd/Makefile

diff --cc configure
index e4a8fa9,d6e7844..5315f7c
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1,6 -1,6 +1,6 @@@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.68 for mod_chxj 0.14.0rc0.
 -# Generated by GNU Autoconf 2.67 for mod_chxj 0.13.2.
++# Generated by GNU Autoconf 2.67 for mod_chxj 0.14.0rc0.
  #
  # Report bugs to <konn@users.sourceforge.jp>.
  #
@@@ -1508,8 -1633,8 +1633,8 @@@ f
  test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
 -mod_chxj configure 0.13.2
 +mod_chxj configure 0.14.0rc0
- generated by GNU Autoconf 2.68
+ generated by GNU Autoconf 2.67
  
  Copyright (C) 2010 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
@@@ -1877,8 -2002,8 +2002,8 @@@ cat >config.log <<_ACEO
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
 -It was created by mod_chxj $as_me 0.13.2, which was
 +It was created by mod_chxj $as_me 0.14.0rc0, which was
- generated by GNU Autoconf 2.68.  Invocation command line was
+ generated by GNU Autoconf 2.67.  Invocation command line was
  
    $ $0 $@
  
@@@ -12963,8 -12175,8 +12175,8 @@@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wr
  # report actual input values of CONFIG_FILES etc. instead of their
  # values after options handling.
  ac_log="
 -This file was extended by mod_chxj $as_me 0.13.2, which was
 +This file was extended by mod_chxj $as_me 0.14.0rc0, which was
- generated by GNU Autoconf 2.68.  Invocation command line was
+ generated by GNU Autoconf 2.67.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
@@@ -13029,8 -12241,8 +12241,8 @@@ _ACEO
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
 -mod_chxj config.status 0.13.2
 +mod_chxj config.status 0.14.0rc0
- configured by $0, generated by GNU Autoconf 2.68,
+ configured by $0, generated by GNU Autoconf 2.67,
    with options \\"\$ac_cs_config\\"
  
  Copyright (C) 2010 Free Software Foundation, Inc.

diff --cc include/config.h
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc support/freebsd/Makefile
index 0c5d311,e7252fd..d07dba6
--- 1/support/freebsd/Makefile
--- 2/support/freebsd/Makefile
+++ b/support/freebsd/Makefile
@@@ -10,9 -10,9 +10,9 @@@ PORTVERSION=    0.14.0rc
  PORTREVISION=   1
  PORTEPOCH=      1
  CATEGORIES=     www
- MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE_JP:=modchxj/51290/}
+ MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE_JP:=modchxj/51413/}
  PKGNAMEPREFIX=  ${APACHE_PKGNAMEPREFIX}
 -DISTNAME=       mod-chxj_0.13.2
 +DISTNAME=       mod-chxj_0.14.0rc0
  EXTRACT_SUFX=   .src.tar.gz
  
  MAINTAINER=     konno@qsdn.co.jp