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)
commit6b312143793b34da3f54f5f5032af002c31bcc5a
tree97b7debc0d414b736f0c371d130a9480a8cbaf2c
parent845086149b157629e1e50f0ff4a0c722d9af095c
parent8fbb0979da8e42c65a1c5de1279165f6abb2b153
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: remove pointless condition

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