Merge remote branch 'ayanes/master'
commitf373c004b80bff339e9ca3d5aa774037547faf03
authorScott Chacon <schacon@gmail.com>
Fri, 28 May 2010 17:42:18 +0000 (28 10:42 -0700)
committerScott Chacon <schacon@gmail.com>
Fri, 28 May 2010 17:42:18 +0000 (28 10:42 -0700)
treeb6df234f470bbafe87c8156b9d422e7c1b4a6b96
parentf77de62dfbb199c6c1117832d30fa23373954629
parent3df4f3dfd15717f4dc74304bf1ecccaaccd7fecb
Merge remote branch 'ayanes/master'