Automated merge with file:///cygdrive/e/srv/hg/skel
--- a/.vimrc Sun Mar 28 22:27:06 2010 +0300+++ b/.vimrc Wed Mar 31 00:04:06 2010 +0300@@ -8,7 +8,9 @@ " Same as set ts=4, by default - 8, how long TAB. set tabstop=4 " Use spaces instead TAB.+set expandtab set shiftwidth=4+set softtabstop=4 set smarttab set et