yacy_search_server/source/net
Michael Peter Christen 80fe3d7860 Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git
Conflicts:
	source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java
2013-02-04 10:57:54 +01:00
..
yacy Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git 2013-02-04 10:57:54 +01:00