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

[Kouhei Maeda]

 debianmeetingresume2010-natsu.tex |  484 +++++++++++++++++++-------------------
 1 file changed, 253 insertions(+), 231 deletions(-)

New commits:
commit c300244833942d64ad401b43686f2007f77dbf5a
Merge: 38bf856 36fa121
Author: Kouhei Maeda <mkouhei at palmtb.net>
Date:   Thu Jul 15 10:55:55 2010 -1000

    Merge branch 'master' of ssh://git.debian.org/git/tokyodebian/monthly-report
    
    Conflicts:
    	debianmeetingresume2010-natsu.tex
    
    Signed-off-by: Kouhei Maeda <mkouhei at palmtb.net>

commit 38bf856b6a24ca014e8b8af79406564496a4eb3f
Author: Kouhei Maeda <mkouhei at palmtb.net>
Date:   Wed Jul 14 15:47:09 2010 -1000

    Update upstart 2nd.
    
    Signed-off-by: Kouhei Maeda <mkouhei at palmtb.net>

commit 8320425346564447b212441bf87f1a13cc9a5bfc
Author: Kouhei Maeda <mkouhei at palmtb.net>
Date:   Wed Jul 14 14:51:15 2010 -1000

    Update upstart.
    
    Signed-off-by: Kouhei Maeda <mkouhei at palmtb.net>