# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1429395040 -3600
# Node ID d3d073aceaea16ee1625363380337b3dad916861
# Parent  053ef01b71a864c1976681daf10253e3708218ce# Parent  a0e751d6c3ad1bf5a5b53613a354b50744222373
Merge.

diff -r 053ef01b71a8 -r d3d073aceaea tests/ChangeLog
diff -r 053ef01b71a8 -r d3d073aceaea tests/automated/lisp-tests.el