Merge branch 'cleanup' into master-merge

Conflicts:
	config
	cron-jobs/sourceballs
	db-functions
	db-move
	db-remove
	db-update

1 files changed, 19 insertions, 5 deletions

diff --git a/cron-jobs/sourceballs.skip b/cron-jobs/sourceballs.skip
index 14d6f4b..0e1731c 100644
--- a/cron-jobs/sourceballs.skip
+++ b/cron-jobs/sourceballs.skip
@@ -1,14 +1,28 @@
-nexuiz-data
+0ad-data
+alienarena-data
+blobwars-data
+btanks-data
+dangerdeep-data
+egoboo-data
+fillets-ng-data
+flightgear-data
+frogatto-data
+gcompris-data
+naev-data
+openarena-data
+rocksndiamonds-data
+smc-data
+speed-dreams-data
 torcs-data
 tremulous-data
 ufoai-data
-frogatto-data
 vdrift-data
-naev-data
-btanks-data
+warmux-data
 wesnoth-data
-texlive-bin
+widelands-data
+xonotic-data
 texlive-bibtexextra
+texlive-bin
 texlive-core
 texlive-fontsextra
 texlive-formatsextra