Merge remote branch 'andrecardoso/master'
commit169b4b3ad8efd5df81092d38ab8edd07b71ca1c0
authorScott Chacon <schacon@gmail.com>
Mon, 14 Dec 2009 20:31:39 +0000 (14 12:31 -0800)
committerScott Chacon <schacon@gmail.com>
Mon, 14 Dec 2009 20:31:39 +0000 (14 12:31 -0800)
tree0aee87e43b770f2c3fed6b2f6a6621568d36aeee
parentc8bd70d86a505da7f1cc9439c50350776a5ef235
parented7235a4d54f0f98fb5efadc4e3507cd549fbe74
Merge remote branch 'andrecardoso/master'