acardona/CATMAID — pull request #369 by OliverUv (2012-07-22 18:18:03+00:00)
Title: Switch to single dump

Merged tables.sql and data.sql into tables_and_data.sql, made appropriate changes wherever they were used. Merge was made by loading them into a new database, then running the new scripts/database/dump-database.sh. Tests now load from the merged file, and pass.

Dubious changes are rows 3, 6 in tables_and_data.sql (which github interprets as a renamed and edited data.sql)