Merge with revision fad8dc1acfa3
[pithos] / solr / src /
drwxr-xr-x   ..
drwxr-xr-x - gr