Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/aria2/PKGBUILD
	community-staging/ekg2/PKGBUILD
	community-staging/filezilla/PKGBUILD
	community-staging/freerdp/PKGBUILD
	community-staging/gloox/PKGBUILD
	community-staging/gnustep-base/PKGBUILD
	community-staging/gsasl/PKGBUILD
	community-staging/gtk-gnutella/PKGBUILD
	community-staging/gwenhywfar/PKGBUILD
	community-staging/ifuse/PKGBUILD
	community-staging/jabberd14/PKGBUILD
	community-staging/libinfinity/PKGBUILD
	community-staging/libmicrohttpd/PKGBUILD
	community-staging/libvirt/PKGBUILD
	community-staging/mailutils/PKGBUILD
	community-staging/minbif/PKGBUILD
	community-staging/net6/PKGBUILD
	community-staging/nzbget/PKGBUILD
	community-staging/openscenegraph/PKGBUILD
	community-staging/qwtpolar-svn/PKGBUILD
	community-staging/remmina-plugins/PKGBUILD
	community-staging/rsyslog/PKGBUILD
	community-staging/smalltalk/PKGBUILD
	community/musca/PKGBUILD
	community/ogre/PKGBUILD
	community/thoggen/PKGBUILD
	extra/archboot/PKGBUILD
	extra/esound/PKGBUILD
	extra/hal/PKGBUILD
	staging/claws-mail/PKGBUILD
	staging/cups/PKGBUILD
	staging/empathy/PKGBUILD
	staging/glib-networking/PKGBUILD
	staging/gnome-vfs/PKGBUILD
	staging/gnutls/PKGBUILD
	staging/gtk-vnc/PKGBUILD
	staging/lftp/PKGBUILD
	staging/libgpod/PKGBUILD
	staging/libimobiledevice/PKGBUILD
	staging/libvncserver/PKGBUILD
	staging/msmtp/PKGBUILD
	staging/nettle/PKGBUILD
	staging/telepathy-gabble/PKGBUILD
	staging/vino/PKGBUILD
	staging/vlc/PKGBUILD
	staging/weechat/PKGBUILD
	staging/wireshark/PKGBUILD
	staging/xfce4-mailwatch-plugin/PKGBUILD
	staging/xmlsec/PKGBUILD
	testing/wget/PKGBUILD

0 files changed, 0 insertions, 0 deletions