Merge branch 'master' of git://github.com/blynn/gitmagic
commit7f32bca69da3c62aca7d0ac55797a6360a500974
authorJunJie Nan <nanjunjie@gmail.com>
Fri, 24 Jun 2011 07:36:45 +0000 (24 15:36 +0800)
committerJunJie Nan <nanjunjie@gmail.com>
Fri, 24 Jun 2011 07:36:45 +0000 (24 15:36 +0800)
tree1f8fa4dd5b0c8d664ef59a39c48707a3ed6f22f3
parentb61e0c1ff533e0c46623c4b0cca773dca7f1918c
parent319b02bc659fce0b37fba21c2474445e24997e91
Merge branch 'master' of git://github.com/blynn/gitmagic