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

[Junichi Uekawa]

 debianmeetingresume201211.tex |   21 ++++++++++++++-------
 image201211/prework.tex       |   17 +----------------
 2 files changed, 15 insertions(+), 23 deletions(-)

New commits:
commit d8773198392d3b7023c0643325dfee3185b511a1
Merge: de4bf70 1939cfd
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri Nov 16 19:40:22 2012 +0900

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

commit de4bf70a2e3fca11360280fe65a437537128e681
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri Nov 16 19:39:41 2012 +0900

    prepare for printing

commit 3e8f85243fdeefcc5a5eab0a8f3fe0c19aeffa62
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri Nov 16 18:14:03 2012 +0900

    minor typographic fixes.

commit f275db34476e53f6df0579ade1643215d324be7f
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri Nov 16 18:11:07 2012 +0900

    make consistent SysVinit

commit f61953f888878bfdf0d3a1dbb83754dc55848d56
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri Nov 16 18:08:55 2012 +0900

    add space to make this document 20 pages, as multiple of 4.

commit d4966e59915a7b88ebbb70d6b2d6fa326680606d
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri Nov 16 17:55:57 2012 +0900

    minor edit.