emacs-rails.rcp
Merge branch 'master' of github.com:valda/dotfiles

Conflicts:
	.gitignore
w32-ime-mode-line-state-indicator
Merge branch 'master' of github.com:valda/dotfiles