95ec2bfa74b6
Merge.
| author | Steve Losh <steve@stevelosh.com> | 
|---|---|
| date | Thu, 04 Nov 2010 17:07:48 -0400 | 
| parents | d3e0c0c7ff37 (current diff) f5178198080a (diff) | 
| children | d00614f860c8 | 
| branches/tags | (none) | 
| files | vim/.vimrc | 
Merge.
| author | Steve Losh <steve@stevelosh.com> | 
|---|---|
| date | Thu, 04 Nov 2010 17:07:48 -0400 | 
| parents | d3e0c0c7ff37 (current diff) f5178198080a (diff) | 
| children | d00614f860c8 | 
| branches/tags | (none) | 
| files | vim/.vimrc |