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

[Junichi Uekawa]

 debianmeetingresume201211.tex |   16 ++++++++
 image201210/quiz.tex          |    2 -
 image201211/quiz.tex          |   78 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 95 insertions(+), 1 deletion(-)

New commits:
commit 2b0ce3b849cf62ac778a9404a3fa6efdb6005274
Merge: 74acebc aaaef69
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri Nov 16 15:59:06 2012 +0900

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

commit 74acebcbf97e9e3d40ad35c464feb460823f6e42
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri Nov 16 15:56:29 2012 +0900

    fix comment.

commit 2c332a0516c15d7a9b17c547c937bfa53aa3d170
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri Nov 16 15:56:21 2012 +0900

    trivia quiz template.