Timestamp:
2015-11-25T02:49:24Z (9 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Children:
3fbce97
Parents:
7051acb (diff), 365b25a (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:

Merge branch 'parson' of github.com:bitlbee/bitlbee into parson

(No files)

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