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

[Junichi Uekawa]

 debianmeetingresume2008-fuyu.tex |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 3b1651c21ee2591a8635072237adbca1a57be897
Merge: 1b8e100bb82f21a0d2a457395e97238417c84b7d 37bde4ca63f545feab65ca080cc7ac2788623bd4
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Tue Dec 2 00:24:02 2008 +0900

    Merge branch 'master' of ssh://git.debian.org/git/tokyodebian/monthly-report
    
    Conflicts:
    	debianmeetingresume2008-fuyu.tex

commit 1b8e100bb82f21a0d2a457395e97238417c84b7d
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Mon Dec 1 10:02:31 2008 +0900

    fix and hand-apply patch from nakao.