Merge remote branch 'etrillaud/proofreading-chapter2'
commit7eb49570cc75a042a83b47c1a3cf777c9fdf67f4
authorScott Chacon <schacon@gmail.com>
Mon, 1 Mar 2010 19:51:32 +0000 (1 11:51 -0800)
committerScott Chacon <schacon@gmail.com>
Mon, 1 Mar 2010 19:51:32 +0000 (1 11:51 -0800)
treee2e942543391f00803ddfe6f7d2064d54a150a26
parent0734e5ac530fac11977d60fe721f31783b1c3527
parent52ffbb75593e77512bbbd5b04b70e4c52e525dda
Merge remote branch 'etrillaud/proofreading-chapter2'