merging r4250 to the trunk

This commit is contained in:
tworrall 2012-08-06 16:26:04 +00:00
parent ff7ef0267f
commit d5624a9669

View file

@ -813,6 +813,15 @@
<url-pattern>/managePublications</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>ManagePeopleForOrganizationController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ManagePeopleForOrganizationController</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>ManagePeopleForOrganizationController</servlet-name>
<url-pattern>/managePeople</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>ShowClassHierarchyController</servlet-name>
<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ShowClassHierarchyController</servlet-class>