Author: sarowe Date: Sat Mar 29 01:38:08 2014 New Revision: 1582936 URL: http://svn.apache.org/r1582936 Log: SOLR-5920: mergeprops (merged trunk r1582934) Modified: lucene/dev/branches/branch_4x/ (props changed) lucene/dev/branches/branch_4x/solr/ (props changed)