diff options
author | Timothy Pearson <[email protected]> | 2012-03-09 10:25:20 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2012-03-09 10:25:20 -0600 |
commit | b2ae31dda03876696451e44dbb99fc39352f2a56 (patch) | |
tree | 6e25a22ca423b8dc94a6c1adb1bcf3553a70d716 /kopete/protocols/jabber | |
parent | 1afe30db0a775d83b0bbc22ba11393cf49ea3532 (diff) | |
parent | 4683955de9eec1da5e2291be69dac6ad83a0fe6d (diff) | |
download | tdenetwork-b2ae31dda03876696451e44dbb99fc39352f2a56.tar.gz tdenetwork-b2ae31dda03876696451e44dbb99fc39352f2a56.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdenetwork
Diffstat (limited to 'kopete/protocols/jabber')
0 files changed, 0 insertions, 0 deletions