Merge branch 'master' of git://github.com/blynn/gitmagic
commit2f7614217e181b647ce0ef476262e22198ce1aee
authorJunJie Nan <nanjunjie@gmail.com>
Thu, 10 Mar 2011 10:17:45 +0000 (10 18:17 +0800)
committerJunJie Nan <nanjunjie@gmail.com>
Thu, 10 Mar 2011 10:17:45 +0000 (10 18:17 +0800)
tree6162580da9c1d2e5f6c0a6d64da25929157b88e4
parent81390f096a5ec4fc6c3082eea8c67295b218d0ee
parentb1aa68ab4d91fb9f9c71ac6b4f9b701ccf360709
Merge branch 'master' of git://github.com/blynn/gitmagic