# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1373463122 -3600
# Node ID 52b9fe8f44c0a8a73504b04ffccc166cf7881aa6
# Parent  b8c2808b33d42ebec83e3a3a9dcb8e832e229f4f# Parent  f9e4d44504a41130a606118b24531e7e6683c93e
Merge.

diff -r b8c2808b33d4 -r 52b9fe8f44c0 lisp/ChangeLog
diff -r b8c2808b33d4 -r 52b9fe8f44c0 src/ChangeLog