Merge branch 'master' of git://github.com/blynn/gitmagic
commitb3a11fc45c07c34a0c51cf392f342e11594d7300
authorJunJie Nan <nanjunjie@gmail.com>
Tue, 5 Jul 2011 07:05:21 +0000 (5 15:05 +0800)
committerJunJie Nan <nanjunjie@gmail.com>
Tue, 5 Jul 2011 07:05:21 +0000 (5 15:05 +0800)
tree3c2a4af727ecc8164746bad30379b912acf40764
parent7f32bca69da3c62aca7d0ac55797a6360a500974
parentca64e01419565b456e09333aa9a1ea943f80ca19
Merge branch 'master' of git://github.com/blynn/gitmagic