Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Mar 2014 23:09:56 +0000 (00:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Mar 2014 23:09:56 +0000 (00:09 +0100)
commit4da8dc64be50cd814b4dab75693207dc73bca47a
tree79184f2aee4f090b3e5108a4ff6542e165aa8e52
parentcbe92a93026a235dc17f698d58660be4910f0373
parent7caf48e036583cd5833f5dc07ab14960dff25e04
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: miscellaneous cosmetics

Conflicts:
configure

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