[elpa] 02/04: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa

[Mario Lang]

mlang pushed a commit to branch master
in repository elpa.

commit 89e811c2db286f3b493775c5b7f5e43881f4ba2e
Merge: 60ae18e 5315891
Author: Mario Lang <ml...@delysid.org>
Date:   Thu May 22 14:07:42 2014 +0200

    Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa