[Tokyodebian-commits] Tokyo area Debian meeting resources.: Changes to 'master'

[Yukiharu YABUKI]

 debianmeetingresume200706.tex |  482 ++++++++++++++++++++++--------------------
 1 file changed, 254 insertions(+), 228 deletions(-)

New commits:
commit b8117d01961aeeec625c2bcf4e9875c5526c4e44
Merge: 4a824eb0869fc849f4924c7accc8b6c129050198 4fe26a1a8f599e0787cd01c6ca4027c7c36f33b4
Author: Yukiharu YABUKI <yabuki at Ernalda.localdomain>
Date:   Sat Jun 23 22:18:57 2007 +0900

    fix conflict

commit 4a824eb0869fc849f4924c7accc8b6c129050198
Author: Yukiharu YABUKI <yabuki at Ernalda.localdomain>
Date:   Sat Jun 23 22:17:00 2007 +0900

    debian-community.org

commit 059cbd214727e7465c24c2dc2629a9c8774c6176
Author: Yukiharu YABUKI <yabuki at Ernalda.localdomain>
Date:   Sat Jun 23 22:03:50 2007 +0900

    Notice for emacs user in EUC-JP