Max Kellermann c22cbbf828 Merge branch 'v0.16.x'
Conflicts:
	src/output/osx_plugin.c
	src/text_input_stream.c
2012-04-05 00:45:39 +02:00
..
2011-07-19 00:24:20 +02:00
2012-04-05 00:45:39 +02:00
2011-01-29 10:13:54 +01:00
2011-01-29 10:13:54 +01:00
2012-04-05 00:45:39 +02:00