Merge remote branch 'etrillaud/master'
commit75b2b2abdc14e3763d1ba591c40daa15b17bb691
authorScott Chacon <schacon@gmail.com>
Mon, 1 Mar 2010 19:46:34 +0000 (1 11:46 -0800)
committerScott Chacon <schacon@gmail.com>
Mon, 1 Mar 2010 19:46:34 +0000 (1 11:46 -0800)
tree0f0bfeb4ffb6bb981e4a332bb9ea158258024a62
parent9c1e683ccc045ad108386ffce24d125fbd5e6503
parent300506da7748b2956105a2a24d76017305501656
Merge remote branch 'etrillaud/master'