Max Kellermann 530e480748 Merge branch 'v0.15.x'
Conflicts:
	src/archive/bz2_plugin.c
	src/archive_api.h
	src/input/file_input_plugin.c
	test/run_input.c
2009-12-15 20:26:38 +01:00
..
2009-11-12 09:17:03 +01:00
2009-11-12 09:17:03 +01:00
2009-12-15 20:26:38 +01:00