alarm/uboot-sunxi to 2014.04-3
aur/plexmediaserver to 0.9.9.10.458-1
core/linux-raspberrypi-latest to 3.14.6-1
aur/arm-mem-git to 11.2e6f275-1
extra/ffmpeg to 2.2.3-2
Merge branch 'master' of github.com:archlinuxarm/PKGBUILDs
extra/x265 to 1.1-1
extra/x265 fix
Merge remote-tracking branch 'upstream/master'

Conflicts:
	alarm/uboot-sunxi/PKGBUILD