Merge remote branch 'ashchan/master'
commit20664eca955cd2396f25dd265b70c34a5775dfce
authorScott Chacon <schacon@gmail.com>
Mon, 14 Dec 2009 20:29:14 +0000 (14 12:29 -0800)
committerScott Chacon <schacon@gmail.com>
Mon, 14 Dec 2009 20:29:14 +0000 (14 12:29 -0800)
tree51ae5906103c1352ecbd88d712d8ebb8971e8756
parent5d412fcda138ee50f0ad35930ff914bfdb8bb045
parentf104ec93cd0108b60dafa1f8ebf410dfce390a11
Merge remote branch 'ashchan/master'