Merge branch 'master' of github.com:nanjj/gitmagic
commitc7ed234dac9b3789abd064d592f91dbb15eb2d63
authorJunJie Nan <nanjunjie@gmail.com>
Tue, 8 Mar 2011 01:55:26 +0000 (8 09:55 +0800)
committerJunJie Nan <nanjunjie@gmail.com>
Tue, 8 Mar 2011 01:55:26 +0000 (8 09:55 +0800)
tree9d832a34f8cd813923274961d0e9380f0b7d9421
parentf2e07f721e66e29f98b27a7a48710dc989951387
parent185a1618836274f5e5c253cc09a324624a03a269
Merge branch 'master' of github.com:nanjj/gitmagic