Merge remote branch 'ashchan/master'
commitde7ddfc78a27ef35fc31f3a9e195d2eb9935aeff
authorScott Chacon <schacon@gmail.com>
Wed, 2 Dec 2009 18:17:17 +0000 (2 10:17 -0800)
committerScott Chacon <schacon@gmail.com>
Wed, 2 Dec 2009 18:17:17 +0000 (2 10:17 -0800)
tree5fddbf4d2ba0f7d6cc8d19496ff6f3302987911e
parent25c0e8837a9cf3be135dcd32600788a359437033
parent81c9c8dd3cfba228d1ae4ede4aed2661277a9f5c
Merge remote branch 'ashchan/master'