Merge branch 'master' of github.com:nanjj/gitmagic
commit65ce5f5c9d6e6f9b2f9fff677bcf592befe55ce4
authorJunJie Nan <nanjunjie@gmail.com>
Tue, 8 Mar 2011 02:10:03 +0000 (8 10:10 +0800)
committerJunJie Nan <nanjunjie@gmail.com>
Tue, 8 Mar 2011 02:10:03 +0000 (8 10:10 +0800)
tree9d832a34f8cd813923274961d0e9380f0b7d9421
parent2b55c6b6a81d6ee25958d53f0817e5d26617c357
parentc7ed234dac9b3789abd064d592f91dbb15eb2d63
Merge branch 'master' of github.com:nanjj/gitmagic