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

[Junichi Uekawa]

 2012-11.muse |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6935e95a239ff639ca208e22fb54ba05a2d816d5
Merge: 1403da0 530fe99
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Sun Nov 18 19:27:52 2012 +0900

    Merge branch 'master' of ssh://git.debian.org/git/tokyodebian/muse
    
    Conflicts:
    	2012-11.muse

commit 1403da05beb4d4bd357f07321bb5932a054fd891
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Sat Nov 17 21:01:43 2012 +0900

    add enkai place.