Merge commit '15201e256035a3e8f9d3d7b96fc327467e1a8ead'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Aug 2014 17:31:08 +0000 (19:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Aug 2014 17:31:08 +0000 (19:31 +0200)
commit00d234688512c83f3e62b6781676469b78f4ab2b
tree51dd1839347e11b44b9420dd23b629c99fa25ed7
parent0160fe454c38a507eaf53ec9012e07244597f672
parent15201e256035a3e8f9d3d7b96fc327467e1a8ead
Merge commit '15201e256035a3e8f9d3d7b96fc327467e1a8ead'

* commit '15201e256035a3e8f9d3d7b96fc327467e1a8ead':
  configure: check $as first before using $gas as GNU as

Conflicts:
configure

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