pre-merge commit
pre-commit merge 2
wtf

Conflicts:

private/backup_migrate/site/manual/TheBuckminsterFullerInstitute-2014-01
-09T20-03-57.mysql.gz.info

private/backup_migrate/site/manual/TheBuckminsterFullerInstitute-2014-01
-10T11-19-57.mysql.gz.info

private/backup_migrate/site/manual/TheBuckminsterFullerInstitute-2014-01
-10T14-40-38.mysql.gz.info

private/backup_migrate/site/manual/TheBuckminsterFullerInstitute-2014-01
-10T18-18-36.mysql.gz.info

private/backup_migrate/site/manual/TheBuckminsterFullerInstitute-2014-01
-16T13-13-58.mysql.gz.info

private/backup_migrate/site/manual/TheBuckminsterFullerInstitute-2014-01
-16T17-30-37.mysql.gz.info

private/backup_migrate/site/manual/TheBuckminsterFullerInstitute-2014-01
-16T18-05-39.mysql.gz.info

private/backup_migrate/site/manual/TheBuckminsterFullerInstitute-2014-01
-16T18-27-37.mysql.gz.info

private/backup_migrate/site/manual/TheBuckminsterFullerInstitute-2014-01
-16T18-29-32.mysql.gz.info