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

[Nobuhiro Iwamatsu]

 2010-05.muse     |    6 +++---
 2010-06-OSC.muse |   26 ++++++++++++++++++++++++++
 index.muse       |    1 +
 3 files changed, 30 insertions(+), 3 deletions(-)

New commits:
commit 1c36b522e941746a722329d75941163c7569cc26
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Wed Jul 7 09:44:46 2010 +0900

    Update index
    
    Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>

commit 5c72a480d5968f4926ce720b836a15f643a9d26a
Merge: 08e2f77 c7c670b
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Wed Jul 7 09:42:01 2010 +0900

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

commit 08e2f771958f98aeb237ac4e1d83259b49e2e3ae
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Tue Jul 6 06:23:08 2010 +0900

    Add OSC2010-do infomation
    
    Signed-off-by: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>

commit 64b6b9d6b57ec28eafef98eaf771c5a515b1a225
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Thu Jun 17 22:19:50 2010 +0900

    update with publish

commit ca021a5dc77bf6b66fd6d8e436448c0b0985a768
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Wed Jun 9 11:39:48 2010 +0900

    update with publish

commit 30d7440ab5f5247f44b72f3d58f5441292fffa37
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Sat May 15 15:13:28 2010 +0900

    update with publish