Upstream: libsodium
Merge branch 'upstream' libsodium
Rename for libx32-libsodium
fix libx32-libsodium
Upstream: lib32-libffi 3.0.13-1
Merge branch 'upstream': libx32-libffi 3.0.13-1

Conflicts:
	lib32-libffi/repos/multilib-x86_64/PKGBUILD
	libx32-libffi/PKGBUILD
Upstream: lib32-llvm 3.4.1-1
Merge branch 'upstream': libx32-llvm 3.4.1-1

Conflicts:
	lib32-llvm/repos/multilib-x86_64/PKGBUILD
	libx32-llvm/PKGBUILD
	libx32-llvm/cindexer-clang-path.patch
	libx32-llvm/clang-pure64.patch
	libx32-llvm/enable-lto.patch
	libx32-llvm/fix-gold-lto-linking.patch
Fix libx32-libffi assigning --host=x86_64-unknown-linux-gnux32
Upstream: lib32-clang 3.4-2
Merge branch 'upstream': lib32-clang
Rename: libx32-clang
Fix libx32-clang 3.4-1
Upstream gcc-multilib 4.9.0-3
Merge branch 'upstream': gcc-multilib-x32 4.9.0_3-1

Conflicts:
	gcc-multilib-x32/PKGBUILD
	gcc-multilib-x32/gcc-4.9-tree-ssa-threadedge.patch
	gcc-multilib/repos/multilib-x86_64/PKGBUILD
Upstream: redis 2.8.10-1
Merge branch 'upstream': binx32-redis 2.8.10

Conflicts:
	redis/repos/community-i686/PKGBUILD
	redis/repos/community-x86_64/PKGBUILD
	redis/trunk/PKGBUILD
Upstream: lib32-openssl 1.0.1.h-1
Merge branch 'upstream': libx32-openssl 1.0.1.h-1

Conflicts:
	lib32-openssl/repos/multilib-x86_64/PKGBUILD
	libx32-openssl/PKGBUILD