branch: elpa-admin commit e55d6b15034a5f6aad9cc32095252f078a9c3307 Merge: 21e1b0e da7456c Author: Stefan Monnier <monn...@iro.umontreal.ca> Commit: Stefan Monnier <monn...@iro.umontreal.ca>
Sync with yasnippet/master
branch: elpa-admin commit e55d6b15034a5f6aad9cc32095252f078a9c3307 Merge: 21e1b0e da7456c Author: Stefan Monnier <monn...@iro.umontreal.ca> Commit: Stefan Monnier <monn...@iro.umontreal.ca>
Sync with yasnippet/master