Wim Taymans ad06ac2b4b Merge branch 'master' into 0.11
Conflicts:
	ext/resindvd/rsnwrappedbuffer.c
2011-08-25 12:49:26 +02:00
..
2011-05-18 12:06:38 -07:00
2011-08-25 12:49:26 +02:00
2011-08-04 09:36:07 +02:00
2011-06-04 20:26:02 +01:00
2011-06-04 20:26:02 +01:00
2010-03-24 00:19:02 +00:00
2011-06-15 16:06:36 +02:00
2010-06-12 00:19:00 +01:00
2011-08-04 09:36:07 +02:00