Upstream: gcc-multilib 4.9.0-4
Merge branch 'upstream': gcc-multilib-x32 4.9.0_4-1

Conflicts:
	gcc-multilib-x32/PKGBUILD
	gcc-multilib/repos/multilib-x86_64/PKGBUILD
Upstream redis 2.8.11-1
Merge branch 'upstream': binx32-redis 2.8.11-1

Conflicts:
	redis/repos/community-i686/PKGBUILD
	redis/repos/community-x86_64/PKGBUILD
	redis/trunk/PKGBUILD
Upstream python2 2.7.7-1
Merge branch 'upstream': binx32-python2 2.7.7-1

Conflicts:
	python2/repos/extra-i686/PKGBUILD
	python2/repos/extra-x86_64/PKGBUILD
	python2/trunk/PKGBUILD
Upstream gcc-multilib 4.9.0-5
Merge branch 'upstream': gcc-multilib-x32 4.9.0_5-1

Conflicts:
	gcc-multilib-x32/PKGBUILD
	gcc-multilib/repos/multilib-x86_64/PKGBUILD