How can I find out which files have changed between 2 versions ?
All the modified files are listed in the changelog.txt file included with the zip. To see specific changes (and even make merging them easier) you can use a program like http://www.winmerge.org/ on Windows or http://www.changesapp.com on a Mac.