Michael Niedermayer 46ad2d9e44 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  miscellaneous typo fixes

Conflicts:
	configure
	libavformat/avisynth.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 11:12:11 +02:00
..
2013-07-14 22:10:38 +02:00
2013-07-10 15:12:05 -04:00
2011-08-01 11:36:16 +02:00