[elpa] 02/02: Merge commit '469cd3bc117bfb8da0c03a2a2fb185e80c81d068'

[Eric Schulte]

eschulte pushed a commit to branch master
in repository elpa.

commit 961b79aba3fe032584d43c5a83d8ad5951e721a6
Merge: 5c3c5f0 469cd3b
Author: Eric Schulte <schulte.e...@gmail.com>
Date:   Fri Sep 5 20:09:12 2014 -0400

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

 packages/web-server/README        |    2 +-
 packages/web-server/web-server.el |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)