removed:
  src/schooltool/app/browser/templates/f_database.pt
  src/schooltool/app/browser/templates/f_database_related.pt
  src/schooltool/calendar/generate_vcal_dict.py
  src/schooltool/calendar/tests/test_generate_vcal_dict.py
  src/schooltool/calendar/vcal_dict.py
  src/schooltool/demographics/
  src/schooltool/demographics/README.txt
  src/schooltool/demographics/__init__.py
  src/schooltool/demographics/browser/
  src/schooltool/demographics/browser/__init__.py
  src/schooltool/demographics/browser/configure.zcml
  src/schooltool/demographics/browser/demographics.txt
  src/schooltool/demographics/browser/demographics_macros.pt
  src/schooltool/demographics/browser/display_form.pt
  src/schooltool/demographics/browser/edit_form.pt
  src/schooltool/demographics/browser/ftesting.zcml
  src/schooltool/demographics/browser/ftests.py
  src/schooltool/demographics/browser/menu_macros.pt
  src/schooltool/demographics/browser/nameinfo_view.pt
  src/schooltool/demographics/browser/person_add.pt
  src/schooltool/demographics/browser/personform.py
  src/schooltool/demographics/browser/schooldata_edit.pt
  src/schooltool/demographics/browser/schooldata_view.pt
  src/schooltool/demographics/browser/search.pt
  src/schooltool/demographics/browser/table.pt
  src/schooltool/demographics/browser/table.py
  src/schooltool/demographics/configure.zcml
  src/schooltool/demographics/demographics-overrides.zcml
  src/schooltool/demographics/interfaces.py
  src/schooltool/demographics/overrides.zcml
  src/schooltool/demographics/person.py
  src/schooltool/demographics/sampledata.py
  src/schooltool/demographics/tests.py
  src/schooltool/demographics/utility.py
  src/schooltool/export/ftests/non_ascii.txt
  src/schooltool/export/ftests/test_non_ascii_data.xls
  src/schooltool/term/README.txt
  utilities/README.txt
  utilities/generate_vcal_dict.py
  utilities/gpl.py
added:
  src/schooltool/app/browser/templates/f_settings.pt
  src/schooltool/person/browser/f_password_changed.pt
  src/schooltool/person/tests/test_sampledata.py
renamed:
  src/schooltool/demographics/event_titles.txt => src/schooltool/person/event_titles.txt
modified:
  CHANGES.txt
  MANIFEST.in
  Makefile
  src/schooltool/app/README.txt
  src/schooltool/app/booking.txt
  src/schooltool/app/browser/app.py
  src/schooltool/app/browser/cal.py
  src/schooltool/app/browser/flourish.zcml
  src/schooltool/app/browser/ftests/README.txt
  src/schooltool/app/browser/ftests/app.txt
  src/schooltool/app/browser/templates.txt
  src/schooltool/app/security.txt
  src/schooltool/app/tests/catalog-integration.txt
  src/schooltool/basicperson/demographics.py
  src/schooltool/basicperson/sampledata.py
  src/schooltool/calendar/README.txt
  src/schooltool/calendar/browser/calendar.py
  src/schooltool/calendar/browser/flourish.zcml
  src/schooltool/calendar/browser/resources/calendar.css
  src/schooltool/calendar/browser/templates/calendar_tertiary_nav.pt
  src/schooltool/common/configure.zcml
  src/schooltool/common/translations.zcml
  src/schooltool/course/browser/section.py
  src/schooltool/devmode/devmode.txt
  src/schooltool/export/ftests/errant_data.txt
  src/schooltool/export/ftests/sample_data.txt
  src/schooltool/export/ftests/test_data.xls
  src/schooltool/export/importer.py
  src/schooltool/export/tests/test_export.py
  src/schooltool/index.txt
  src/schooltool/level/tests/level-integration.txt
  src/schooltool/locales/ar.po
  src/schooltool/locales/de.po
  src/schooltool/locales/fo.po
  src/schooltool/locales/it.po
  src/schooltool/locales/ko.po
  src/schooltool/locales/lt.po
  src/schooltool/locales/pt_BR.po
  src/schooltool/locales/schooltool.pot
  src/schooltool/person/browser/f_password_form.pt
  src/schooltool/person/browser/flourish.zcml
  src/schooltool/person/browser/person.py
  src/schooltool/person/browser/stests/password_edit.txt
  src/schooltool/person/configure.zcml
  src/schooltool/person/sampledata.py
  src/schooltool/relationship/README.txt
  src/schooltool/schoolyear/browser/schoolyear.py
  src/schooltool/schoolyear/schoolyear.py
  src/schooltool/schoolyear/schoolyear.zcml
  src/schooltool/securitypolicy/README.txt
  src/schooltool/securitypolicy/ftesting.zcml
  src/schooltool/securitypolicy/security_descriptions.txt
  src/schooltool/skin/flourish/page.py
  src/schooltool/skin/flourish/resources/colors.css
  src/schooltool/skin/flourish/resources/flourish.js
  src/schooltool/skin/flourish/resources/jquery/css/schooltool/jquery-ui-overrides.css
  src/schooltool/skin/flourish/templates/modal_form_link.pt
  src/schooltool/table/table.py
  src/schooltool/term/term.py
  src/schooltool/testing/README.txt
  src/schooltool/timetable/browser/calendar.py
  src/schooltool/traverser/README.txt
  version.txt.in
conflicts:
  Conflict: can't delete src/schooltool/demographics/browser because it is not empty.  Not deleting.
pending merge tips: (use -v to see all merge revisions)
  Douglas Cerna 2011-11-20 Moved pack database action to server page (LP: #886310) and removed /database.html view