John Cupitt 9b1ff0c399 Merge remote-tracking branch 'origin/7.28' into 7.28
Conflicts:
	ChangeLog
	libvips/iofuncs/cache.c
2012-06-21 12:10:52 +01:00
..
2012-04-06 12:09:53 +01:00
2011-10-18 17:11:04 +01:00
2012-04-09 18:03:17 +01:00
2012-06-18 14:49:39 +01:00
2012-01-15 11:15:12 +00:00
2012-01-28 11:53:45 +00:00
2012-02-28 14:17:02 +00:00
2012-06-18 18:50:12 +01:00
2012-01-30 10:18:06 +00:00
2011-12-31 18:22:42 +00:00
2012-01-15 11:15:12 +00:00
2011-12-31 18:22:42 +00:00
2012-01-11 15:00:37 +00:00