Merge remote branch 'LaPingvino/master'
commita5ee2469b7d830d4d701811c5d8d915418e0c20d
authorScott Chacon <schacon@gmail.com>
Fri, 28 May 2010 17:40:52 +0000 (28 10:40 -0700)
committerScott Chacon <schacon@gmail.com>
Fri, 28 May 2010 17:40:52 +0000 (28 10:40 -0700)
treee4dfc1604e34c60ef4261aa6df86d0318324e64e
parentec2c70641dae7c982524b92a7d314054f8da25ed
parent408f46dd90527755383e04c0335565889ab47869
Merge remote branch 'LaPingvino/master'