Changeset 3dcc878 for protocols/jabber

Timestamp:
2015-03-25T23:22:11Z (10 years ago)
Author:
dequis <dx@…>
Branches:
master
Children:
4543b6bd
Parents:
b95d03b (diff), 61d21e5b (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 'master' into develop

(No files)

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