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

[Kei Hibino]

 debianmeetingresume201003.tex |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 9dd6488fa640053309923711365f3037c024a4e9
Merge: 3c0f9a8b07f4812a6fc2dc2aee230ce67b1348aa 9b90425852b69ba8f37d53eedd1e374fa4a4fd70
Author: HIBINO Kei <hibi at doubler.jp>
Date:   Fri Mar 19 07:50:16 2010 +0900

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

commit 3c0f9a8b07f4812a6fc2dc2aee230ce67b1348aa
Author: HIBINO Kei <hibi at doubler.jp>
Date:   Fri Mar 19 07:45:42 2010 +0900

    Update.