Merge remote branch 'chunzi/master'
commitd07a66a674bb3bf389683ae07ddd35d5e1be5a34
authorScott Chacon <schacon@gmail.com>
Wed, 2 Dec 2009 18:17:52 +0000 (2 10:17 -0800)
committerScott Chacon <schacon@gmail.com>
Wed, 2 Dec 2009 18:17:52 +0000 (2 10:17 -0800)
treee7e1fa59ab453d2134267f092bed94c840fa6c18
parentde7ddfc78a27ef35fc31f3a9e195d2eb9935aeff
parent5dececf9dbbb06dc27f2e3d4283bc82f50638e62
Merge remote branch 'chunzi/master'