Index: openacs-4/packages/acs-content-repository/acs-content-repository.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/acs-content-repository.info,v
diff -u -r1.109.2.14 -r1.109.2.15
--- openacs-4/packages/acs-content-repository/acs-content-repository.info	13 Feb 2016 15:31:48 -0000	1.109.2.14
+++ openacs-4/packages/acs-content-repository/acs-content-repository.info	18 Mar 2016 13:41:57 -0000	1.109.2.15
@@ -7,7 +7,7 @@
   <initial-install-p>t</initial-install-p>
   <singleton-p>t</singleton-p>
 
-  <version name="5.9.1d10" url="http://openacs.org/repository/download/apm/acs-content-repository-5.9.1d10.apm">
+  <version name="5.9.1d11" url="http://openacs.org/repository/download/apm/acs-content-repository-5.9.1d11.apm">
     <owner url="http://openacs.org">OpenACS</owner>
     <summary>The canonical repository for OpenACS content.</summary>
     <release-date>2015-10-04</release-date>
@@ -19,7 +19,7 @@
     <license>GPL</license>
     <maturity>3</maturity>
 
-    <provides url="acs-content-repository" version="5.9.1d10"/>
+    <provides url="acs-content-repository" version="5.9.1d11"/>
     <requires url="acs-kernel" version="5.9.0"/>
     <requires url="acs-tcl" version="5.9.1d2"/>
     <requires url="acs-service-contract" version="5.9.0"/>
Index: openacs-4/packages/acs-content-repository/sql/common/mime-type-data.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/common/mime-type-data.sql,v
diff -u -r1.10.8.1 -r1.10.8.2
--- openacs-4/packages/acs-content-repository/sql/common/mime-type-data.sql	23 Oct 2015 11:21:49 -0000	1.10.8.1
+++ openacs-4/packages/acs-content-repository/sql/common/mime-type-data.sql	18 Mar 2016 13:41:57 -0000	1.10.8.2
@@ -503,6 +503,19 @@
 insert into cr_extension_mime_type_map (mime_type, extension) values ('application/vnd.openxmlformats-officedocument.wordprocessingml.template', 'dotx');
 
 
+insert into cr_mime_types(label, mime_type, file_extension) select 'Microsoft Office Word macro enabled', 'application/vnd.ms-word.document.macroenabled.12', 'docm' from dual;
+insert into cr_mime_types(label, mime_type, file_extension) select 'Microsoft Office Word Template macro enabled', 'application/vnd.ms-word.template.macroenabled.12', 'dotm' from dual;
+insert into cr_mime_types(label, mime_type, file_extension) select 'Microsoft Office Excel macro enabled', 'application/vnd.ms-excel.sheet.macroenabled.12', 'xlsm' from dual;
+insert into cr_mime_types(label, mime_type, file_extension) select 'Microsoft Office Excel Template macro enabled', 'application/vnd.ms-excel.template.macroenabled.12', 'xltm' from dual;
+insert into cr_mime_types(label, mime_type, file_extension) select 'Microsoft Office Excel Addin macro enabled', 'application/vnd.ms-excel.addin.macroenabled.12', 'xlam' from dual;
+insert into cr_mime_types(label, mime_type, file_extension) select 'Microsoft Office Excel Sheet binary macro enabled', 'application/vnd.ms-excel.sheet.binary.macroenabled.12', 'xlsb' from dual;
+insert into cr_mime_types(label, mime_type, file_extension) select 'Microsoft Office PowerPoint Addin macro enabled', 'application/vnd.ms-powerpoint.addin.macroenabled.12', 'ppam' from dual;
+insert into cr_mime_types(label, mime_type, file_extension) select 'Microsoft Office PowerPoint Presentation macro enabled', 'application/vnd.ms-powerpoint.presentation.macroenabled.12', 'pptm' from dual;
+insert into cr_mime_types(label, mime_type, file_extension) select 'Microsoft Office PowerPoint Template macro enabled', 'application/vnd.ms-powerpoint.template.macroenabled.12', 'potm' from dual;
+insert into cr_mime_types(label, mime_type, file_extension) select 'Microsoft Office PowerPoint Slideshow macro enabled', 'application/vnd.ms-powerpoint.slideshow.macroenabled.12', 'ppsm' from dual;
+
+
+
 --  Here are some less common mime types and extensions not defined here.
 --
 --  tsp       | application/dsptype
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-content-repository/sql/common/upgrade/upgrade-5.9.1d10-5.9.1d11.sql'.
Fisheye: No comparison available.  Pass `N' to diff?