Merge remote branch 'dorion/master'
commit3721768aa54411c51d9b233c16d91389a0e2e5e2
authorScott Chacon <schacon@gmail.com>
Fri, 28 May 2010 17:37:57 +0000 (28 10:37 -0700)
committerScott Chacon <schacon@gmail.com>
Fri, 28 May 2010 17:37:57 +0000 (28 10:37 -0700)
tree2a4db6fb05b86ca9feac2262a0a1f6fcabd27a58
parent81798f05849d84e48e5f0bf4ca5bb68669459a1a
parent42811cbc6c72e9e4737cdbf611a98fae8598bea7
Merge remote branch 'dorion/master'