Jim Blake 2fa9583569 Merge branch 'develop' into feature/fauxEditing ... Conflicts: webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader.java webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationRdfParser.java webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/Critical.java		2014-11-09 16:14:48 -05:00
..
mannlib	Merge branch 'develop' into feature/fauxEditing	2014-11-09 16:14:48 -05:00