Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Oct 2013 21:24:19 +0000 (22:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Oct 2013 21:24:52 +0000 (22:24 +0100)
* qatar/master:
  build: remove pointless condition

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

Trivial merge