Michael Niedermayer 0104570fb6 Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'
* commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7':
  silly typo fixes

Conflicts:
	doc/protocols.texi
	libavcodec/aacpsy.c
	libavformat/utils.c
	tools/patcheck

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04 10:17:52 +02:00
..
2012-10-26 18:24:50 +02:00
2013-03-07 01:12:04 +01:00
2012-10-24 22:25:43 +02:00
2013-01-15 22:50:19 +01:00
2012-10-13 20:35:56 +02:00
2012-09-15 15:40:36 -04:00