diff options
author | Lance Stout <lancestout@gmail.com> | 2013-01-16 23:06:41 -0800 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2013-01-16 23:06:41 -0800 |
commit | 64ef6904320d6dd4dbdf4f9418a1dd054163899a (patch) | |
tree | 0c86039f5036313daece4d1f630f9d9b100d4b46 /sleekxmpp/plugins/google/settings | |
parent | 01da222d67858ac82951a0a3b01670ea201abd9c (diff) | |
parent | 41991b5982e6cfc9015eaf00663348ca6d4d3b2d (diff) | |
download | slixmpp-64ef6904320d6dd4dbdf4f9418a1dd054163899a.tar.gz slixmpp-64ef6904320d6dd4dbdf4f9418a1dd054163899a.tar.bz2 slixmpp-64ef6904320d6dd4dbdf4f9418a1dd054163899a.tar.xz slixmpp-64ef6904320d6dd4dbdf4f9418a1dd054163899a.zip |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/google/settings')
0 files changed, 0 insertions, 0 deletions