Merge commit '60e6cecf9bc7d6a238e6b316da52edcc6d1ef7f8'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 01:06:41 +0000 (02:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 01:10:15 +0000 (02:10 +0100)
commitfd982f2b40b8908a71d25202f0e6842206d8a78a
tree36690c47c832b10a054787ff97cf5ab76a5df8ba
parentabb6821e43e74bfce1565c4a6ed75cfb666a2e6d
parent60e6cecf9bc7d6a238e6b316da52edcc6d1ef7f8
Merge commit '60e6cecf9bc7d6a238e6b316da52edcc6d1ef7f8'

* commit '60e6cecf9bc7d6a238e6b316da52edcc6d1ef7f8':
  configure: avserver does not need $ldl

Conflicts:
configure

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