Merge remote-tracking branch 'origin/testing' into testing

Conflicts:
	libkgapi/PKGBUILD
This commit is contained in:
Fabian Kosmale 2014-04-13 16:11:04 +00:00
commit 21a0d114ea

Diff Content Not Available