Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Mar 2013 01:21:00 +0000 (02:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Mar 2013 01:21:04 +0000 (02:21 +0100)
commit07ab8d3369b2fee9d3871a5f65313be5d9fe5c89
treea8f582910c0e612f0974118bc1d28cd57e567115
parentf0a5f71074d914dde1585f12ae5101bd639b83e1
parent3f78f0904bfa012b171cecfae87af7c6909c8ede
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Revert "build: disable iconv by default."

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