Merge commit 'ace87c19ed4c4882d7b9b3ce512c4c195e39a203'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Jun 2013 08:40:15 +0000 (10:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Jun 2013 08:41:37 +0000 (10:41 +0200)
commit14a61bc3f9ad68151368bc3577bb26fe1146fbf4
tree35833c3caa5890fe7df7c0294b779c83a23016ea
parent1152863a3f1bca11744ccfbc645185176d440c82
parentace87c19ed4c4882d7b9b3ce512c4c195e39a203
Merge commit 'ace87c19ed4c4882d7b9b3ce512c4c195e39a203'

* commit 'ace87c19ed4c4882d7b9b3ce512c4c195e39a203':
  configure: whitespace cosmetics

Conflicts:
configure

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