Merge with 9e62eed712763292a41becaefd1a1c239fc4f0c6
[pithos] / solr /
drwxr-xr-x   ..
drwxr-xr-x - conf
drwxr-xr-x - src