gGetDb function
Merge branch 'master' into pdo-db
Revert "fix db error (I hope)"

This reverts commit 8a999a13ba82d6166a2b019db677e14d5b44db3e.
Revert "hack notifications to use helpmebot.org.uk's mysql server"

This reverts commit 854fe738a9dbff54db84beaa4042137486534104.
convert accbotsend
Merge branch 'master' into pdo-db

Conflicts:
	includes/accbotSend.php
	includes/database.php
fix
trigger warnings on all DB query usages
Change error message
database config
Merge branch 'pdo-db' of github.com:stwalkerster/waca into pdo-db
comments
import DataObject from github.com:dvs-inc/hotel-system (written by me)

(cherry picked from commit 970886b7532a4e223cc146dc62733cf33dab1f31)
convert clearolddata script
convert title blacklist script
Merge branch 'master' into pdo-db

Conflicts:
	includes/database.php
Merge remote-tracking branch 'origin/master' into pdo-db
Merge branch 'master' into pdo-db
Fixes
Revert "trigger warnings on all DB query usages"

This reverts commit 31b3cfcb694d697f675078badd3ac89526fea33b.

Conflicts:
	includes/database.php