Merge commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Aug 2013 07:22:24 +0000 (09:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Aug 2013 07:22:30 +0000 (09:22 +0200)
* commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c':
  doc/print_options: Move options headers to a saner place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/print_options.c

Simple merge