Merge commit 'b634b36fcebfe16b837b6c4044f5d5cb99a75040'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Sep 2013 10:05:02 +0000 (12:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Sep 2013 10:05:02 +0000 (12:05 +0200)
commit92424a45d0c3154ad83aaba6e0fb8dbb17d8d1a4
tree57bfa4eb5592ef1950b1fd733de4c8ee4c02c15a
parentbcd1c2061211c7a4126db241229c5ecb71e05f80
parentb634b36fcebfe16b837b6c4044f5d5cb99a75040
Merge commit 'b634b36fcebfe16b837b6c4044f5d5cb99a75040'

* commit 'b634b36fcebfe16b837b6c4044f5d5cb99a75040':
  mem: Improve documentation wording and spelling

Conflicts:
libavutil/mem.c
libavutil/mem.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/mem.c
libavutil/mem.h