Merge remote branch 'chunzi/master'
commitca4b0ab826ab852d78ae18943e6b1c94b14009b2
authorScott Chacon <schacon@gmail.com>
Mon, 1 Mar 2010 19:34:11 +0000 (1 11:34 -0800)
committerScott Chacon <schacon@gmail.com>
Mon, 1 Mar 2010 19:34:11 +0000 (1 11:34 -0800)
treedaab15987a7307c85741b613654cc21e398ca24e
parent0376aa713dd9d79f40233a1f101c1e4ad305c4da
parentfe69bb03a87dd94fa2ac929bdbf620ae318cb7da
Merge remote branch 'chunzi/master'