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

[Junichi Uekawa]

 debianmeetingresume200912.tex |  133 +++++++++++++++++-------------------------
 image200912/prework.tex       |   83 ++++++++++++++++++++++++++
 2 files changed, 137 insertions(+), 79 deletions(-)

New commits:
commit 60af0dbac8ad19b74f6ce3d19a3116fdc8038e75
Merge: c4a846b25519a786ae9052d8b45245e1cab84923 caa1fc0faec3d44377bc7f829520a59a47ec3ec8
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Wed Dec 9 23:18:24 2009 +0900

    Merge branch 'tmp-merge' into tmp-hideki
    
    Conflicts:
    	image200912/prework.tex

commit c4a846b25519a786ae9052d8b45245e1cab84923
Merge: 28b348ef8037a77a9876f51b9faa776d65a8e0f7 c858e3cf607e8feefca3057b665f6c86c2fdb401
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Wed Dec 9 23:17:11 2009 +0900

    Merge branch 'tmp-honjo' into tmp-hideki
    
    Conflicts:
    	image200912/prework.tex

commit 28b348ef8037a77a9876f51b9faa776d65a8e0f7
Author: Hideki Yamane <henrich at babytalk.mithril-linux.org>
Date:   Wed Dec 9 21:06:07 2009 +0900

    add prework by Hideki Yamane

commit c858e3cf607e8feefca3057b665f6c86c2fdb401
Author: Hironori Honjo <hiro at hogelande.com>
Date:   Wed Dec 9 13:51:18 2009 +0900

    Add honjo prework

commit caa1fc0faec3d44377bc7f829520a59a47ec3ec8
Author: KITAHARA, katsuyuki <kita3suginami+sdbg-lk at gmail.com>
Date:   Wed Dec 9 01:47:30 2009 +0900

    Add Kitahara prework

commit c43d8b89c3de0f8b61e621ddd3e1d61509f3ffbd
Merge: d86ee5c7b9da09d90f410650468480a9e4174503 72e7ca342ef45a2acd0c7127e1be42922817eb34
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Wed Dec 9 23:14:12 2009 +0900

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

commit d86ee5c7b9da09d90f410650468480a9e4174503
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Mon Dec 7 22:14:35 2009 +0900

    shuffle table around.