OSDN Git Service

Merge branch 'master' of git.sourceforge.jp:/gitroot/gwit/gwit
authorHirotaka Kawata <info@techno-st.net>
Mon, 12 Jul 2010 22:39:31 +0000 (07:39 +0900)
committerHirotaka Kawata <info@techno-st.net>
Mon, 12 Jul 2010 22:39:31 +0000 (07:39 +0900)
commit95fe7c97ab0aaa642b9c1f1bf94149d705f7a6d0
treecc6ffebba996ca480d327de35ed06d0ce921a1bc
parenta39000b3a0d61c59211464eff49a4aa56f13e493
parent85809f99bd45f0e1831a99127744d926406c8342
Merge branch 'master' of git.sourceforge.jp:/gitroot/gwit/gwit

Conflicts:
gwit/main.py
gwit/timeline.py
gwit/twitterapi.py
gwit/main.py
gwit/timeline.py
gwit/twitterapi.py