Merge branch 'github_2_1' into rel_2_1
authorrsoulliere <robert.soulliere@mohawkcollege.ca>
Thu, 6 Oct 2011 18:19:47 +0000 (14:19 -0400)
committerrsoulliere <robert.soulliere@mohawkcollege.ca>
Thu, 6 Oct 2011 18:19:47 +0000 (14:19 -0400)
Conflicts:
1.6/integration/intro.xml
admin/admin-intro.xml
appendices/about_this_documentation.xml
appendices/bookindex.xml
appendices/glossary.xml
appendices/more_info.xml
appendices/permissions.xml
appendices/schema.xml
development/development_intro.xml
intro/about_evergreen.xml
intro/intro_intro.xml
intro/releasenotes.xml
media/evergreen_logo.gif
opac/opac_intro.xml
reports/report-intro.xml
stafftasks/README
stafftasks/stafftasks_intro.xml

1  2 
reports/README

diff --combined reports/README
index 0000000,0000000..e69de29
new file mode 100644 (file)
--- /dev/null
--- /dev/null