Merge branch 'master' of github.com:nanjj/gitmagic
commit185a1618836274f5e5c253cc09a324624a03a269
authorJunJie Nan <nanjunjie@gmail.com>
Tue, 8 Mar 2011 01:48:57 +0000 (8 09:48 +0800)
committerJunJie Nan <nanjunjie@gmail.com>
Tue, 8 Mar 2011 01:48:57 +0000 (8 09:48 +0800)
tree9d832a34f8cd813923274961d0e9380f0b7d9421
parentc0cc4769b82f69dd14cc5006d2b8ba7eb8837f92
parent3149a4620051a6e0519a5fbb51e646cec09b6485
Merge branch 'master' of github.com:nanjj/gitmagic