Merge branch 'far2-original'
Conflicts: edit.cpp interf.cpp makefile_vc
Authored by: ctapmex 2011-08-23
Parents: [69050b][c8fa3f]