df54cb569995
Merge.
| author | Steve Losh <steve@stevelosh.com> | 
|---|---|
| date | Wed, 04 Dec 2013 12:07:55 -0500 | 
| parents | 6a9528799caa (current diff) 2de1f78616fd (diff) | 
| children | ef1f9749a219 | 
| branches/tags | (none) | 
| files | vim/vimrc | 
Merge.
| author | Steve Losh <steve@stevelosh.com> | 
|---|---|
| date | Wed, 04 Dec 2013 12:07:55 -0500 | 
| parents | 6a9528799caa (current diff) 2de1f78616fd (diff) | 
| children | ef1f9749a219 | 
| branches/tags | (none) | 
| files | vim/vimrc |