Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 22 May 2014 13:27:18 +0000 (15:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 22 May 2014 13:27:21 +0000 (15:27 +0200)
* cehoyos/master:
  Autodetect Asterisk raw pcm with extension "sln".

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

Trivial merge