Make log_truncate() SECURITY DEFINER.
Make log_truncate() SECURITY DEFINER.
Merge remote branch 'origin/master'
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.
Fixing several compiler warnings (unused and
possibly used uninitialized things).
When upgrading from an earlier version of 2.2 to a newer version of 2.2
the old shared library (that now has the version number in its name) might
not still be present.  This change avoids having to call C functions as
part of the slonik queries done during a UPDATE FUNCTIONS script.
updating the release notes
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
versioning all symbols in the shared library.

Slony 2.2 allows multiple versions of the shared library to be exist
on the filesystem($libdir) at once.  This means they can be loaded
into the same backend at once, but we need to ensure that the
exported symbols are unique
updating release notes bug 290
uping version/beta number
Squashed commit of the following:

commit 0d1c7738dc21f2c9e398b790d101f0024dab0a54
Author: Steve Singer <ssinger@ca.afilias.info>
Date:   Thu Jun 6 10:45:34 2013 -0400

    win32 makefile fixes for the PGVER variable

commit 9f2eed91d129304a0e67534c977394cce04492cf
Merge: c9a4687 86eac22
Author: Steve Singer <ssinger@ca.afilias.info>
Date:   Thu Jun 6 09:42:31 2013 -0400

    Merge remote-tracking branch 'origin/master' into pgcommon_22

commit c9a4687f8fa28cf93a417c0b0597b8c6bf65cea7
Author: Steve Singer <ssinger@ca.afilias.info>
Date:   Sun Jun 2 21:39:23 2013 -0400

    Link with pgcommon on win32 when building with PG 9.3+

commit abd5addee71a2fa55a634673730c2d1d18dfe8e9
Author: Steve Singer <ssinger@ca.afilias.info>
Date:   Sun Jun 2 21:31:37 2013 -0400

    expose HAVE_PGCOMMON to the slonik makefile so it can link in pgcommon if required

    Conflicts:
    	configure.ac

commit 9217d72cdf740e7cb9ca7b540c3a7df334f81e0e
Author: Steve Singer <ssinger@ca.afilias.info>
Date:   Tue May 28 10:55:40 2013 -0400

    link with pgcommon in addition to pgport on PG 9.3+

    PG 9.3 introduces a new library called libpgcommon we need to link
    with this when we link with pgport.
updating windows compile docs to mention PGVER
Merge branch 'master' into execute-script-fixes

Conflicts:
	src/slonik/slonik.c
fixing merge error - string replacements in SQL
release notes update