[Tokyodebian-commits] Tokyo area Debian Monthly Meeting muse web-page files.: Changes to 'master'

[Junichi Uekawa]

 2013-04.muse |    4 ++--
 index.muse   |    6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 978a55223b6fac5f887f363971c954908de7ef28
Merge: aed2278 010e0a0
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Wed Mar 27 07:01:59 2013 +0900

    Merge branch 'master' of ssh://git.debian.org/git/tokyodebian/muse
    
    Conflicts:
    	2013-02.muse
    	index.muse

commit aed2278d699430a2ab032639acf4249e274e5ed7
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Wed Mar 27 07:00:22 2013 +0900

    add event ID for april 2013

commit f31f18a16f9499e46513f52caeab4588f75399bf
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Mon Jan 21 07:26:30 2013 +0900

    update with publish

commit a59cb550b4cbb7e69fc7ccdf9c419dac8285ce83
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Mon Jan 21 07:23:06 2013 +0900

    add notes about 2013-02 meeting.