Merge branch 'core-updates'
authorLudovic Courtès <ludo@gnu.org>
Sat, 2 May 2015 20:42:53 +0000 (22:42 +0200)
committerLudovic Courtès <ludo@gnu.org>
Sat, 2 May 2015 20:42:53 +0000 (22:42 +0200)

Trivial merge