Merge remote branch 'ameuret/master'
commita83c9256c1541e4302bcbaa37882540089c41cd1
authorScott Chacon <schacon@gmail.com>
Wed, 2 Dec 2009 18:05:04 +0000 (2 10:05 -0800)
committerScott Chacon <schacon@gmail.com>
Wed, 2 Dec 2009 18:05:04 +0000 (2 10:05 -0800)
tree8edbd5a67a62971a66f00cae6f894eb83c65bd14
parentbd4ca4dfbdc02f403edb0597e2cad76dabf14e52
parent292ac7ab2f295fbbb1dac6a2b752b6623f14a165
Merge remote branch 'ameuret/master'