Module Name: htdocs Committed By: kano Date: Fri Jul 2 23:06:23 JST 2010 htdocs/ja Update of /cvsroot/htdocs/ja In directory mogu:/tmp/cvs-serv6853 Log Message: import from TNF. people/core.xml: 1.8 Status: Vendor Tag: TNF Release Tags: date-2010-07-02 C htdocs/ja/people/core.xml 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF htdocs/ja