Changeset bef322e for protocols/purple

Timestamp:
2015-05-28T17:46:23Z (10 years ago)
Author:
dequis <dx@…>
Branches:
master
Children:
51b14b8, f453a7f
Parents:
6191263 (diff), 08a9323 (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.