Merge remote branch 'abtris/master'
commit97f26b3b4658dc8e7bc0a5fe82a6284893fe814f
authorScott Chacon <schacon@gmail.com>
Mon, 1 Mar 2010 19:37:28 +0000 (1 11:37 -0800)
committerScott Chacon <schacon@gmail.com>
Mon, 1 Mar 2010 19:37:28 +0000 (1 11:37 -0800)
treec8e82d64c3c7fcae1ddb19053db957f9758b4a15
parenta99ed58c252b933fafa92e8371051fbbe737ee2b
parent70329266a800124a7a9723703c87c7a752d2a5b5
Merge remote branch 'abtris/master'