Merge commit '4da3f410d176dd1a55d7cbe5d2e2ead342027f13'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Nov 2013 01:26:03 +0000 (02:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Nov 2013 01:27:24 +0000 (02:27 +0100)
* commit '4da3f410d176dd1a55d7cbe5d2e2ead342027f13':
  configure: Restore doc option to disable building the documentation

Conflicts:
configure

See: eff2edae562096c1e21e8c048392ffe8968181f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>

No differences found