Fixing the magic @STRING@ replacement so that a long line with
such a string crossing a 256 character boundary doesn't fail.

Closing FILE* after reading script files.
Sorting tokens and keywords.
Add SQL='string' option to EXECUTE SCRIPT.
Merge branch 'master' into execute-script-fixes
Fix the slonik script scanner to accept two single quotes
inside a single quoted string.
Merge branch 'master' into execute-script-fixes
Merge branch 'master' into execute-script-fixes

Conflicts:
	src/slonik/slonik.c
fixing merge error - string replacements in SQL
release notes update
Change the temporary conninfo on clone prepare to '<event pending>'
for consistency.
Fix typo in '<event pending>' conninfo string.
release notes for bug 252
Merge branch 'execute-script-fixes'

Conflicts:
	RELEASE
updating versions for 2.2.0 beta 4
include malloc.h - alloca() is defined here on win32
add PG VERSION based switch for HAS_LOOKUPEXPLICITNAMESPACE_2  to the MSVC config file
updating the name of the version for the functions in the win32 export file