diff options
| author | snowleo <schneeleo@gmail.com> | 2012-04-11 21:57:58 +0200 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2012-04-11 21:57:58 +0200 |
| commit | 3f9e19d279c7f9534733b9868ca24a11e7e0e19b (patch) | |
| tree | fff53a637c0e967ab1762901fa44176ab644e6ec /EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java | |
| parent | c9e64d9e46c3e97b4be897b4449fdad667753d8e (diff) | |
| parent | 25759064ff4c518193185fe3e993634408230eb7 (diff) | |
| download | Essentials-3f9e19d279c7f9534733b9868ca24a11e7e0e19b.tar Essentials-3f9e19d279c7f9534733b9868ca24a11e7e0e19b.tar.gz Essentials-3f9e19d279c7f9534733b9868ca24a11e7e0e19b.tar.lz Essentials-3f9e19d279c7f9534733b9868ca24a11e7e0e19b.tar.xz Essentials-3f9e19d279c7f9534733b9868ca24a11e7e0e19b.zip | |
Merge branch 'refs/heads/groupmanager'
Conflicts:
EssentialsGroupManager/src/globalgroups.yml
Diffstat (limited to 'EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java')
0 files changed, 0 insertions, 0 deletions