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

Conflicts:
	community/adns/PKGBUILD
	community/afpfs-ng/PKGBUILD
	community/aqbanking/PKGBUILD
	community/arp-scan/PKGBUILD
	community/arpack/PKGBUILD
	community/bind/PKGBUILD
	community/bird/PKGBUILD
	community/cairo-dock/PKGBUILD
	community/cinnamon-control-center/PKGBUILD
	community/commoncpp2/PKGBUILD
	community/cuetools/PKGBUILD
	community/erlang/PKGBUILD
	community/fxdesktop/PKGBUILD
	community/gavl/PKGBUILD
	community/google-gadgets/PKGBUILD
	community/gpicview/PKGBUILD
	community/gtk-aurora-engine/PKGBUILD
	community/icewm-utils/PKGBUILD
	community/inotify-tools/PKGBUILD
	community/jack2/PKGBUILD
	community/judy/PKGBUILD
	community/lash/PKGBUILD
	community/libdlna/PKGBUILD
	community/libgexiv2/PKGBUILD
	community/libgig/PKGBUILD
	community/liblinebreak/PKGBUILD
	community/liblockfile/PKGBUILD
	community/libopenraw/PKGBUILD
	community/librcd/PKGBUILD
	community/librsync/PKGBUILD
	community/libvirt/PKGBUILD
	community/libyaml/PKGBUILD
	community/linux-tools/PKGBUILD
	community/lomoco/PKGBUILD
	community/luasec/PKGBUILD
	community/luasocket/PKGBUILD
	community/lwp/PKGBUILD
	community/lxappearance-obconf/PKGBUILD
	community/lxappearance/PKGBUILD
	community/lxsplit/PKGBUILD
	community/metamail/PKGBUILD
	community/mg/PKGBUILD
	community/nemo-fileroller/PKGBUILD
	community/nsd/PKGBUILD
	community/obby/PKGBUILD
	community/openarena/PKGBUILD
	community/opensc/PKGBUILD
	community/osmo/PKGBUILD
	community/perl-json-xs/PKGBUILD
	community/pyqt3/PKGBUILD
	community/python-pymongo/PKGBUILD
	community/python-pytables/PKGBUILD
	community/qscintilla-qt3/PKGBUILD
	community/qtcurve-gtk2/PKGBUILD
	community/qtcurve-kde4/PKGBUILD
	community/rxvt-unicode/PKGBUILD
	community/smalltalk/PKGBUILD
	community/xmlrpc-c/PKGBUILD
	community/xpad/PKGBUILD
	community/xsettings-client/PKGBUILD
	community/yaws/PKGBUILD
	core/bzip2/PKGBUILD
	core/gcc/PKGBUILD
	core/glibc/PKGBUILD
	core/keyutils/PKGBUILD
	core/ldns/PKGBUILD
	core/libmpc/PKGBUILD
	core/librpcsecgss/PKGBUILD
	core/libtool/PKGBUILD
	core/lvm2/PKGBUILD
	core/lzo2/PKGBUILD
	core/openssl/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit-tools/PKGBUILD
	cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
	extra/aalib/PKGBUILD
	extra/aiksaurus/PKGBUILD
	extra/alsa-oss/PKGBUILD
	extra/alsa-tools/PKGBUILD
	extra/apache/PKGBUILD
	extra/autopano-sift-c/PKGBUILD
	extra/avahi/PKGBUILD
	extra/cfitsio/PKGBUILD
	extra/clamav/PKGBUILD
	extra/compface/PKGBUILD
	extra/dotconf/PKGBUILD
	extra/enca/PKGBUILD
	extra/eventlog/PKGBUILD
	extra/exiv2/PKGBUILD
	extra/faad2/PKGBUILD
	extra/fcgi/PKGBUILD
	extra/ffcall/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/flac/PKGBUILD
	extra/fltk/PKGBUILD
	extra/freealut/PKGBUILD
	extra/freetds/PKGBUILD
	extra/gc/PKGBUILD
	extra/gdome2/PKGBUILD
	extra/giblib/PKGBUILD
	extra/gmime/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnome-python-extras/PKGBUILD
	extra/gnome-speech/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/gsasl/PKGBUILD
	extra/gsl/PKGBUILD
	extra/gtkspell/PKGBUILD
	extra/gupnp-igd/PKGBUILD
	extra/htdig/PKGBUILD
	extra/hugin/PKGBUILD
	extra/id3lib/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/iptraf-ng/PKGBUILD
	extra/jade/PKGBUILD
	extra/jasper/PKGBUILD
	extra/kdesdk-thumbnailers/PKGBUILD
	extra/kdevelop-php/PKGBUILD
	extra/lablgtk/PKGBUILD
	extra/lame/PKGBUILD
	extra/lcms2/PKGBUILD
	extra/lesstif/PKGBUILD
	extra/libaio/PKGBUILD
	extra/libart-lgpl/PKGBUILD
	extra/libass/PKGBUILD
	extra/libasyncns/PKGBUILD
	extra/libavc1394/PKGBUILD
	extra/libbluray/PKGBUILD
	extra/libcaca/PKGBUILD
	extra/libcddb/PKGBUILD
	extra/libchamplain/PKGBUILD
	extra/libdca/PKGBUILD
	extra/libdv/PKGBUILD
	extra/libglade/PKGBUILD
	extra/libgtkhtml/PKGBUILD
	extra/libice/PKGBUILD
	extra/libid3tag/PKGBUILD
	extra/libidl2/PKGBUILD
	extra/libieee1284/PKGBUILD
	extra/libjpeg-turbo/PKGBUILD
	extra/liblo/PKGBUILD
	extra/libmad/PKGBUILD
	extra/libmikmod/PKGBUILD
	extra/libmowgli/PKGBUILD
	extra/libmpd/PKGBUILD
	extra/libmpdclient/PKGBUILD
	extra/libofa/PKGBUILD
	extra/liboil/PKGBUILD
	extra/libotf/PKGBUILD
	extra/libpeas/PKGBUILD
	extra/libqalculate/PKGBUILD
	extra/libraw1394/PKGBUILD
	extra/libsndfile/PKGBUILD
	extra/libstroke/PKGBUILD
	extra/libvncserver/PKGBUILD
	extra/libxkbui/PKGBUILD
	extra/libxss/PKGBUILD
	extra/libytnef/PKGBUILD
	extra/libzvt/PKGBUILD
	extra/lynx/PKGBUILD
	extra/lzo/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mhash/PKGBUILD
	extra/musicbrainz/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/openal/PKGBUILD
	extra/openmpi/PKGBUILD
	extra/pavucontrol/PKGBUILD
	extra/perl-dbi/PKGBUILD
	extra/phonon-vlc/PKGBUILD
	extra/phonon/PKGBUILD
	extra/ppl/PKGBUILD
	extra/progsreiserfs/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pycurl/PKGBUILD
	extra/pyopenssl/PKGBUILD
	extra/pyxml/PKGBUILD
	extra/qt4/PKGBUILD
	extra/qt5/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/schroedinger/PKGBUILD
	extra/sdl_gfx/PKGBUILD
	extra/signon/PKGBUILD
	extra/slang/PKGBUILD
	extra/sofia-sip/PKGBUILD
	extra/spandsp/PKGBUILD
	extra/speech-dispatcher/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/t1lib/PKGBUILD
	extra/taglib/PKGBUILD
	extra/tidyhtml/PKGBUILD
	extra/totem/PKGBUILD
	extra/unixodbc/PKGBUILD
	extra/vigra/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/wavpack/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/webrtc-audio-processing/PKGBUILD
	extra/xfce4-mailwatch-plugin/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xmms/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/yajl/PKGBUILD
	extra/yasm/PKGBUILD
	extra/zenity/PKGBUILD
	extra/zziplib/PKGBUILD
	libre/blackbox-libre/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/sdl-libre/PKGBUILD

13 files changed, 13 insertions, 13 deletions

diff --git a/~emulatorman/hunspell-gl/PKGBUILD b/~emulatorman/hunspell-gl/PKGBUILD
index 8c791a2fe..e3de55b8d 100644
--- a/~emulatorman/hunspell-gl/PKGBUILD
+++ b/~emulatorman/hunspell-gl/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>, 2009-2010.
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=hunspell-gl
 pkgver=2.9b
diff --git a/~emulatorman/iceape-l10n/PKGBUILD b/~emulatorman/iceape-l10n/PKGBUILD
index be0a6dd07..227467123 100644
--- a/~emulatorman/iceape-l10n/PKGBUILD
+++ b/~emulatorman/iceape-l10n/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
 # Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 # Based on icecat-i18n package, which is in turn based on firefox-i18n
 
 # When updating to a newer upstream release:
diff --git a/~emulatorman/iceape-libre/PKGBUILD b/~emulatorman/iceape-libre/PKGBUILD
index c46631628..db650ddff 100644
--- a/~emulatorman/iceape-libre/PKGBUILD
+++ b/~emulatorman/iceape-libre/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer : Márcio Silva <coadde@lavabit.com>
-# Maintainer : André Silva <emulatorman@lavabit.com>
+# Maintainer : André Silva <emulatorman@parabola.nu>
 
 # We're getting this from Debian Sid
 _debname=iceape
diff --git a/~emulatorman/icecat-l10n/PKGBUILD b/~emulatorman/icecat-l10n/PKGBUILD
index 197e3e236..bb3d47c32 100644
--- a/~emulatorman/icecat-l10n/PKGBUILD
+++ b/~emulatorman/icecat-l10n/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
 # Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 # Based on firefox-i18n package
 
 # When updating to a newer upstream release:
diff --git a/~emulatorman/icecat/PKGBUILD b/~emulatorman/icecat/PKGBUILD
index c26b3c1b7..6e5bddfe6 100644
--- a/~emulatorman/icecat/PKGBUILD
+++ b/~emulatorman/icecat/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Figue <ffigue at gmail>
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
 # Thank you very much to the older contributors:
diff --git a/~emulatorman/icedove-l10n/PKGBUILD b/~emulatorman/icedove-l10n/PKGBUILD
index 208e176ba..9ed01c353 100644
--- a/~emulatorman/icedove-l10n/PKGBUILD
+++ b/~emulatorman/icedove-l10n/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgbase=icedove-l10n
 pkgver=17.0.2.1
diff --git a/~emulatorman/icedove-libre/PKGBUILD b/~emulatorman/icedove-libre/PKGBUILD
index 5ea3ff98f..43cf38f18 100644
--- a/~emulatorman/icedove-libre/PKGBUILD
+++ b/~emulatorman/icedove-libre/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer : Márcio Silva <coadde@lavabit.com>
-# Maintainer : André Silva <emulatorman@lavabit.com>
+# Maintainer : André Silva <emulatorman@parabola.nu>
 
 # We're getting this from Debian Experimental
 _debname=icedove
diff --git a/~emulatorman/iceweasel-l10n/PKGBUILD b/~emulatorman/iceweasel-l10n/PKGBUILD
index 8e0172208..988892cbc 100644
--- a/~emulatorman/iceweasel-l10n/PKGBUILD
+++ b/~emulatorman/iceweasel-l10n/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
 # Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 # Based on icecat-i18n package, which is in turn based on firefox-i18n
 
 # When updating to a newer upstream release:
diff --git a/~emulatorman/iceweasel-libre/PKGBUILD b/~emulatorman/iceweasel-libre/PKGBUILD
index 4f7d77337..b3cf15f28 100644
--- a/~emulatorman/iceweasel-libre/PKGBUILD
+++ b/~emulatorman/iceweasel-libre/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Figue <ffigue at gmail>
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 # Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
 # Thank you very much to the older contributors:
diff --git a/~emulatorman/raider/PKGBUILD b/~emulatorman/raider/PKGBUILD
index c5629e9fc..360c3248e 100644
--- a/~emulatorman/raider/PKGBUILD
+++ b/~emulatorman/raider/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: M.Carreira <arch@carreira.com.pt>
 # Contributor: M.Carreira <arch@carreira.com.pt>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 pkgname=raider
 pkgver=0.10.0
 pkgrel=1
diff --git a/~emulatorman/xchat-xsys-noaudacious/PKGBUILD b/~emulatorman/xchat-xsys-noaudacious/PKGBUILD
index 7ed44c2e3..42b5e9a46 100644
--- a/~emulatorman/xchat-xsys-noaudacious/PKGBUILD
+++ b/~emulatorman/xchat-xsys-noaudacious/PKGBUILD
@@ -1,5 +1,5 @@
 # Contributor: Gökmen Görgen <gkmngrgn_gmail.com>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 pkgname=xchat-xsys-noaudacious
 pkgver=2.2.0
 pkgrel=3
diff --git a/~emulatorman/xonotic-data/PKGBUILD b/~emulatorman/xonotic-data/PKGBUILD
index 13f4d5c12..9ed60c78b 100644
--- a/~emulatorman/xonotic-data/PKGBUILD
+++ b/~emulatorman/xonotic-data/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 35989 2010-12-25 03:22:46Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Alexander Suhoverhov <cy at ngs dot ru>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=xonotic-data
 pkgver=0.5.0
diff --git a/~emulatorman/xonotic/PKGBUILD b/~emulatorman/xonotic/PKGBUILD
index a51606cd5..22b0fa4ac 100644
--- a/~emulatorman/xonotic/PKGBUILD
+++ b/~emulatorman/xonotic/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Alexander Suhoverhov <cy at ngs dot ru>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=xonotic
 pkgver=0.5.0