Merge remote branch 'dagget/master'
commitd2c20d2d3164d607eef5ce4234f265b830ebc9d5
authorScott Chacon <schacon@gmail.com>
Fri, 28 May 2010 17:39:50 +0000 (28 10:39 -0700)
committerScott Chacon <schacon@gmail.com>
Fri, 28 May 2010 17:39:50 +0000 (28 10:39 -0700)
treed841d6f354845f5ed03dc9f4524e5bf3a799c20b
parenta4eed8a87365a37976b9519de802c627dea4d8e7
parenta2e82ab56499befc1cb33b2b187237f0e1104611
Merge remote branch 'dagget/master'