Merge remote branch 'ingorichter/master'
commitf09eca520580e46e030e9181c2ecc1c4fc70a682
authorScott Chacon <schacon@gmail.com>
Fri, 28 May 2010 17:34:30 +0000 (28 10:34 -0700)
committerScott Chacon <schacon@gmail.com>
Fri, 28 May 2010 17:34:30 +0000 (28 10:34 -0700)
tree3ed4db9c773053dbb88ce53188aad8088147f477
parenta66bea20583aca4b9444eaf73e77dd28e563d0f9
parente13f242ac3a3f789d59e6a61d10d4ee842e4e8d8
Merge remote branch 'ingorichter/master'