Upstream postgresql 9.3.4-1
Merge branch 'upstream': binx32-postgresql 9.3.4-1

Conflicts:
	binx32-postgresql/postgresql.confd
	binx32-postgresql/postgresql.rcd
	postgresql/repos/extra-i686/PKGBUILD
	postgresql/repos/extra-i686/postgresql.install
	postgresql/repos/extra-i686/postgresql.tmpfiles.conf
	postgresql/repos/extra-x86_64/PKGBUILD
	postgresql/repos/extra-x86_64/postgresql-check-db-dir
	postgresql/repos/extra-x86_64/postgresql.install
	postgresql/repos/extra-x86_64/postgresql.tmpfiles.conf
	postgresql/trunk/PKGBUILD
	postgresql/trunk/postgresql-check-db-dir
	postgresql/trunk/postgresql.install
	postgresql/trunk/postgresql.tmpfiles.conf
Upstream: lib32-pam 1.1.8-5
Merge branch 'upstream': libx32-pam 1.1.8-5

Conflicts:
	libx32-pam/PKGBUILD
	libx32-pam/__libc_lock_define_initialized.patch
Upstream:
lib32-cracklib 2.9.0-3
lib32-flex 2.5.39-1
lib32-libtirpc 0.2.4-1
Merge branch 'upstream':

libx32-cracklib 2.9.0-3
libx32-flex 2.5.39-1
libx32-libtirpc 0.2.4-1

Conflicts:
	lib32-flex/PKGBUILD
	libx32-cracklib/PKGBUILD
	libx32-libtirpc/PKGBUILD
Fix binx32-postgresql