Merge branch 'master' into rel_3_2_stable

And upgrade version numbers straight to 3.2.2 rather than "just"
resolving the conflicts.

Makefile

@@ -1,6 +1,6 @@
 # pgloader build tool
 APP_NAME   = pgloader
-VERSION    = 3.2.1.preview
+VERSION    = 3.2.2
 
 # use either sbcl or ccl
 CL	   = sbcl

pgloader.spec

@@ -1,6 +1,6 @@
 Summary:            extract, transform and load data into PostgreSQL
 Name:               pgloader
-Version:            3.2.1.preview
+Version:            3.2.2
 Release:            22%{?dist}
 License:            The PostgreSQL Licence
 Group:              System Environment/Base
@@ -40,9 +40,12 @@ echo '-b /usr/bin/pgloader' > $RPM_BUILD_ROOT/etc/prelink.conf.d/%{name}.conf
 /etc/prelink.conf.d/%{name}.conf
 
 %changelog
+=======
+* Sun Sep 6 2015 Dimitri Fontaine <dimitri@2ndQuadrant.fr> - 3.2.2-22
+- Release 3.2.2
+
 * Thu Jan 22 2015 Dimitri Fontaine <dimitri@2ndQuadrant.fr> - 3.2.1.preview-22
 - Release 3.2.1.preview
-
 * Thu Jan 15 2015 Dimitri Fontaine <dimitri@2ndQuadrant.fr> - 3.2.0-22
 - Release 3.2.0
 

src/params.lisp

@@ -28,11 +28,11 @@
 
 (in-package :pgloader.params)
 
-(defparameter *release* nil
+(defparameter *release* t
   "non-nil when this build is a release build.")
 
 (defparameter *major-version* "3.2")
-(defparameter *minor-version* "1")
+(defparameter *minor-version* "2")
 
 (defun git-hash ()
   "Return the current abbreviated git hash of the development tree."