Merge branch 'master' of git://github.com/blynn/gitmagic
commitb61e0c1ff533e0c46623c4b0cca773dca7f1918c
authorJunJie Nan <nanjunjie@gmail.com>
Fri, 3 Jun 2011 08:59:22 +0000 (3 16:59 +0800)
committerJunJie Nan <nanjunjie@gmail.com>
Fri, 3 Jun 2011 08:59:22 +0000 (3 16:59 +0800)
tree73913a9f7f3996cd8b7a24c4e1888cc4bc05bf11
parent68c21d3b51699d402627da0e3351e5fdc72173ff
parent81baba39a4f1dd934f9698f9f74cdb6ca1ddad77
Merge branch 'master' of git://github.com/blynn/gitmagic