yacy_search_server/source
Michael Peter Christen 9ccdd21d76 Merge remote-tracking branch 'aleksejs/fixtrans'
Conflicts:
	locales/ru.lng
	
Tried to merge this but I had to made this 'blind'.
Sorry if I deleted something that was right.
2013-01-22 11:54:38 +01:00
..
net/yacy Merge remote-tracking branch 'aleksejs/fixtrans' 2013-01-22 11:54:38 +01:00
org/apache/tools/tar - added @SuppressWarnings to unused servlet method parameters 2012-07-05 09:14:04 +02:00
log4j.properties