Changeset 6ae1056 for protocols

Timestamp:
2014-02-13T22:41:02Z (10 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
2e815e5, cce1b63
Parents:
7a80925 (diff), 820a2a7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merging two OTR-related bugfixes from pesco.

(No files)

Note: See TracChangeset for help on using the changeset viewer.