[elpa] new-master 0c3c141 061/128: Merge commit '469cd3bc117bfb8da0c03a2a2fb185e80c81d068'

[Stefan Monnier]

branch: new-master
commit 0c3c141d385d9d9f981dc2ae2ec9be4d5428d505
Merge: baea9b9 ad82945
Author: Eric Schulte <schulte.e...@gmail.com>
Commit: Eric Schulte <schulte.e...@gmail.com>

    Merge commit '469cd3bc117bfb8da0c03a2a2fb185e80c81d068'
    
      Merged in the latest version of web-server to account for the actual
      dependency on 24.3 (not 24.4).