Peter Saint-Andre
5472b7ef79
0.0.1
2016-01-06 08:33:15 +00:00
Matthew A. Miller
7d839f60a4
ProtoXEP jingle-ice: Updates to address Council feedback
2016-01-05 10:10:22 -07:00
Ash Ward
1aada090c3
#132 Importing jingle-ice ProtoXEP from psa
2015-12-17 10:45:31 +00:00
Ash Ward
d5fb17baf0
Accepting 'tls-srv' ProtoXEP as XEP-0368
2015-12-15 20:53:19 +00:00
Ashley Ward
1d79afb3b6
Merge pull request #131 from moparisthebest/master
...
Update SRV records for XMPP over TLS draft
2015-12-15 20:48:33 +00:00
Ash Ward
9e7843e9bf
Accepting the 'Message Attaching' ProtoXEP as XEP-0367
2015-12-15 20:28:27 +00:00
Matthew A. Miller
fe2bd885f4
XEP-0366: Initial published version approved by XMPP Council
2015-12-15 10:17:29 -07:00
7789c93a4e
Update SRV records for XMPP over TLS draft
2015-12-15 01:34:25 -05:00
Matthew A. Miller
9da492b518
ProtoXEP Notification Inbox -- fixing versions
2015-12-08 10:23:27 -07:00
Matthew A. Miller
2476089c80
ProtoXEP - Quality of Service (o.b.o Peter Waher)
2015-12-08 10:09:28 -07:00
Matthew A. Miller
12139d5ca7
Update ProtoXEP revision to pre-minor
2015-12-08 10:04:59 -07:00
Piotr Nosek
eca705e635
Add MUC Light XEP
2015-12-08 10:02:58 -07:00
b2989649f4
Initial draft of SRV records for XMPP over TLS
2015-12-08 09:50:22 -07:00
Valérian Saliou
0f93394aa2
Update personal details
...
Previous personal contact addresses became black-holes recently.
2015-12-08 09:42:17 -07:00
Sam Whited
7d57fe0d09
Typo fix in entity versioning
2015-10-28 10:56:49 -05:00
Daniel Gultsch
1b133e6047
introducing a protocol to negotiate omemo encrypted file tranfers over jingle
2015-10-28 09:23:25 -06:00
Andreas Straub
5eda2277f7
Add new OMEMO spec
...
Proposal for a new multi-end to multi-end encryption protocol
2015-10-28 09:16:55 -06:00
Sam Whited
974e0fce16
Add new "message attaching" spec
...
Proposal to allow one message to be "attached" to another (a hint for
the client to display the messages side by side, even if other messages
were sent between them).
2015-10-20 10:34:25 -06:00
Sam Whited
0abee5101e
Add search IQ to entity versioning
2015-09-28 15:40:15 -05:00
Sam Whited
0aae416a7c
Fix a minor issue with an example in EV
2015-09-28 15:36:19 -05:00
Sam Whited
353f30abfe
Fix escaping in entity versioning cdata
2015-09-17 12:57:37 -05:00
Matthew A. Miller
cd2905327c
promoting s2s-over-s5066 to XEP-0365
2015-09-17 10:37:30 -06:00
Steve Kille
f60b582be3
Update to reflect S5066 publication on the Web
2015-09-17 10:11:32 -06:00
Sam Whited
61dd466023
Add profiles / partial sync to entity versioning
2015-09-17 09:43:05 -06:00
Sam Whited
e22172cf39
Fix reference to bare JIDs
2015-09-03 10:04:34 -06:00
Sam Whited
8c40f32172
Address some feedback on entity versioning
2015-09-03 10:04:34 -06:00
Sam Whited
f7eb0a8a8c
Add cache invalidation to entity versioning
2015-09-03 10:04:33 -06:00
Sam Whited
796a7a4d94
Update OTR Disco's security section
2015-08-31 20:41:35 -05:00
Sam Whited
b867a4d568
Remove redundant sentence
2015-08-31 09:47:39 -06:00
Sam Whited
7d8b386dd5
Update registrar submission
2015-08-31 09:47:38 -06:00
Sam Whited
50e058ee03
Support OTRv3 only and remove feature subelements
2015-08-31 09:47:38 -06:00
Sam Whited
81cefd2e88
Initial draft of OTR disco
2015-08-31 09:47:38 -06:00
Sam Whited
b3725e2cf9
Add a use case to entity versioning
...
Also:
Minor typo and wording fixes
Fix broken example XML
More tabbing fixes
2015-08-31 09:42:13 -06:00
Sam Whited
d6b3f54e00
Remove :features: from namespace
2015-08-31 09:42:13 -06:00
Sam Whited
bcefb30da6
Add initial draft of Entity Versioning.
2015-08-31 09:42:13 -06:00
Matthew A. Miller
ae5618890d
XEP-0364 v0.1 - Advance to Experimental
2015-08-27 10:19:12 -06:00
Sam Whited
36bc445997
Fix otr-info construction section
...
Remove unclear opinion from the security section
2015-08-27 10:13:02 -06:00
Matthew A. Miller
7aa9a19790
XEP-0363 v0.1 -- Advanced to Experimental
2015-08-27 09:49:51 -06:00
Matthew A. Miller
3ec99b2c04
fix typo in title
2015-08-24 16:34:49 -06:00
Steve Kille
43257f6b9a
Fix to Standards Track
2015-08-24 16:29:44 -06:00
Steve Kille
a4ce22fefb
Initial X2X over S5066
2015-08-24 16:29:43 -06:00
Sam Whited
9e2d55d700
Fix a typo in my OTR XEP
2015-08-19 11:18:14 -05:00
Matthew A. Miller
97017147d8
Merge pull request #55 from linuxwolf/message-deletion
...
ProtoXEP Message Deletion (submitted by Lance Stout)
2015-08-19 09:40:46 -06:00
Matthew A. Miller
441fe86474
ProtoXEP Message Deletion
2015-08-18 18:36:01 -06:00
Matthew A. Miller
ccfbb0dcf0
ProtoXEP Jingle HTTP Transport Method
2015-08-18 18:33:47 -06:00
Matthew A. Miller
1ebe4ba75e
XEP-0362 v0.1 -- Initial published version approved by the XMPP Council
2015-08-11 09:27:57 -06:00
Sam Whited
c5cd20c877
Initial otr usage draft
2015-08-11 08:16:46 -06:00
Peter Membrey
87ec4f3e14
Remove the reference to SHOULD / MUST
2015-07-28 08:20:30 -06:00
Daniel Gultsch
a59661f821
Http File Upload
...
proposing a XEP to upload files to an entity via HTTP
rendered version can be found here: http://conversations.im/xeps/xep-http-upload.html
2015-07-27 08:32:00 -06:00
Peter Membrey
a7a7fdd92d
Updated element names based on Council feedback and usage in XEP-0176
2015-07-23 16:12:05 +02:00
Sam Whited
8d691de73a
Overwrite XEP-0286 instead of submitting a new XEP
2015-07-23 09:24:00 +02:00
Matthew A. Miller
4c2052ffcc
ProtoXEP Raft v0.0.1: first draft.
2015-07-21 14:18:23 +02:00
Matthew A. Miller
bddd8a4177
ProtoXEP.modile-concerns v0.0.1: first draft.
2015-07-21 11:48:40 +02:00
Matthew A. Miller
44b8c2cd1f
XEP-0361 v0.1: Initial published version approved by the XMPP Council.
2015-07-15 10:29:41 -06:00
Matthew A. Miller
837132b97f
XEP-0360 v0.1: Nonzas (are not Stanzas)
2015-07-14 10:33:48 -06:00
Matthew A. Miller
e3050ef2b8
XEP-0359 v0.1: Unique and Stable Stanza IDs
2015-07-14 10:09:23 -06:00
Steve Kille
79b3628e88
ProtoXEP: Zero Handshake Server to Server Protocol
...
* * *
Update to spell check and to fix two errors reported by Ralph Meijer
* * *
Zap two files that I should not have pushed to GIT
2015-07-14 07:21:52 -06:00
Matthew A. Miller
7055bfa79f
Publish Jingle-pub as XEP-0358
2015-07-02 10:49:44 -06:00
Emmanuel Gil Peyrot
81adf4bc25
Remove the executable bit from XML files.
2015-06-24 00:39:33 +01:00
Matthew A. Miller
09db0b7203
ProtoXEP Message IDs v0.0.1
2015-06-03 08:55:53 -06:00
Matthew A. Miller
67696d747c
ProtoXEP Nonzas v0.0.1
2015-06-03 08:55:38 -06:00
Matthew A. Miller
f1ff2da0b8
ProtoXEP 'REST with XMPP'
2015-05-11 12:19:15 -06:00
Matthew A. Miller
fdccd56700
Proto-XEP Namespace Versioning in urn:xmpp
2015-04-10 08:37:56 -06:00
Matthew A. Miller
123d2d8cba
XEP-0357 v0.1 - Initial published version approved by the XMPP Council.
2015-03-18 08:30:59 -06:00
Matthew A. Miller
246bcbd46e
proto-XEP Push v0.0.2 - Adjust some wording and typo fixes (lance)
2015-03-10 10:48:23 -06:00
Matthew A. Miller
8987e5e814
protoXEP: push v0.0.1 - Initial version
2015-03-02 14:27:55 -07:00
Matthew A. Miller
77b2756a6e
protoXEP privilege-component --> XEP-0356
2015-01-27 12:54:15 -07:00
Matthew A. Miller
1f1d22da8f
protoxep s2s-components: fixed status
2015-01-20 08:53:45 -07:00
Matthew A. Miller
21502f939d
proto-xep s2s-components: initial version
2015-01-20 08:45:38 -07:00
Matthew A. Miller
9ba9b26324
XEP-0355 v0.1: initial published version approved by the XMPP Council
2014-12-18 13:36:17 -07:00
Peter Saint-Andre
0e9ce928a3
0.0.4
2014-12-18 11:42:51 -07:00
Matthew A. Miller
7cba9d292e
proto-XEP namespace-delegation v0.0.1
2014-11-18 08:26:38 -07:00
Matthew A. Miller
55b2c54bd5
proto-xep privilege-component v0.0.3
2014-11-18 08:25:08 -07:00
Matthew A. Miller
2e69a36269
XEP-0353 v0.1: Initial published version approved by XMPP Council
2014-10-02 11:44:17 -06:00
Matthew A. Miller
da567040e8
ProtoXEP CMR v0.0.1 - minor correction to work around tools
2014-09-22 19:22:29 -04:00
Matthew A. Miller
a19d1f4cc8
ProtoXEP CMR v0.0.1 - initial submission
2014-09-22 19:17:51 -04:00
Ash Ward
b6eff145dc
Updating privilege-component protoXEP
2014-09-18 18:27:48 +01:00
Matthew A. Miller
c27e777b7a
ProtoXEP jingle-message v0.0.2
2014-08-29 08:22:40 -06:00
Matthew A. Miller
a2317a78cf
ProtoXEP Client Station Notification v0.0.1
2014-08-15 09:02:04 -06:00
Matthew A. Miller
9c64aa8b1d
ProtoXEP iot-events - Internet of Things - Events
2014-08-13 14:10:53 -06:00
Peter Saint-Andre
6fdddd8923
0.0.2
2014-08-12 12:03:42 -06:00
Matthew A. Miller
b7bd33afe2
ProtoXEP RSF v0.0.2 (redux) - changes based on Council feedback
2014-07-21 09:14:46 -04:00
Matthew A. Miller
127c14d14f
ProtoXEP RSF v0.0.2 - udpated based on Council feedback
2014-07-20 13:24:45 -04:00
Matthew A. Miller
312588a298
XEP-0350 Data Forms Geoloation Element: approved by XMPP Council
...
--HG--
rename : extensions/inbox/geoloc-dataform.xml => extensions/xep-0350.xml
2014-07-03 08:55:26 -06:00
Matthew A. Miller
71ec1a15fd
ProtoXEP geolog-dataform v0.0.3: Updated version, added 'geo:' datatypes to support 'text-single' use case.
2014-06-30 20:15:16 -06:00
Matthew A. Miller
a9da7f313b
ProtoXEP geoloc-dataform v0.0.2: updates per council requests
2014-06-23 13:32:41 -06:00
Matthew A. Miller
d161f50bb4
Rayo CPA --> XEP-0341
2014-06-23 08:18:39 -06:00
Matthew A. Miller
4d90607d30
XEP-0349 v0.1: Rayo Clustering
...
--HG--
rename : extensions/inbox/rayo-clustering.xml => extensions/xep-0349.xml
2014-06-23 08:09:06 -06:00
Matthew A. Miller
d4afd93edd
ProtoXEP Data Forms Geolocation Element
2014-06-19 20:54:58 -06:00
Matthew A. Miller
7611a0100c
ProtoXEP rsf: Recipient Server Side Notifications Filtering
2014-06-02 10:37:36 -06:00
Matthew A. Miller
75fd888a37
XEP-0348 v0.1: signing-forms accepted by council
2014-05-28 09:11:18 -06:00
Matthew A. Miller
686c6d539e
ProtoXEP Signing Forms v0.0.3: Added acknowledgements
2014-05-13 09:49:33 -06:00
Matthew A. Miller
67b4e40417
ProtoXEP: Privileged Components v0.0.1: initial draft
2014-05-12 09:23:13 -06:00
Matthew A. Miller
1596ba1158
ProtoXEP: Signing Forms v0.0.2: see revision
2014-05-12 09:22:49 -06:00
Matthew A. Miller
4695a8288f
ProtoXEP: Buddycloud Channels (fixed)
2014-04-29 10:15:24 -06:00
Matthew A. Miller
ede3a1111d
ProtoXEP: Buddycloud Channels
2014-04-28 10:07:19 -06:00
Matthew A. Miller
f4af46eb9a
ProtoXEP: Rayo Clustering
2014-04-18 10:05:44 -06:00
Matthew A. Miller
518a20b0f2
ProtoXEP: Signing Forms
2014-04-17 13:56:30 -06:00
Matthew A. Miller
a6e0221529
update entity references and remove protoXEPs
2014-04-10 13:06:55 -06:00
Matthew A. Miller
f291286ae5
ProtoXEP IoT - Discovery v0.0.3 < see revision log >
2014-04-09 15:50:17 -06:00
Matthew A. Miller
85380e95b2
ProtoXEP IoT Discovery: Removed any hard-coded account names.
2014-04-07 13:34:55 -06:00
Kevin Smith
fe1055579a
Initial draft of a Form Discovery and Publishing protocol
2014-04-07 12:17:23 +01:00
Matthew A. Miller
4c796fb617
XEP-0345 v0.1: Published initial version approved by XSF Board of Directors
...
--HG--
rename : extensions/inbox/membership-applications.xml => extensions/xep-0345.xml
2014-03-19 11:24:33 -06:00
Matthew A. Miller
17a2fcd29c
XEP-0344 v0.1: Initial published version approved by the XMPP Council
2014-03-14 08:32:23 -06:00
Matthew A. Miller
30ddd5102f
ProtoXEP: IoT - Discovery
2014-03-13 10:19:09 -06:00
Matthew A. Miller
9eea29e39f
ProtoXEP tarttls -- mark as Standards Track
2014-03-10 08:46:26 -06:00
Matthew A. Miller
edff3b7869
ProtoXEP: Impact of TLS and DNSSEC on Dialback
2014-03-10 08:41:12 -06:00
Matthew A. Miller
7019ee441b
missing <status>
2014-02-26 11:04:07 -07:00
Matthew A. Miller
a7ba6928bd
ProtoXEP: Form of Membership Applications
2014-02-26 10:36:05 -07:00
Peter Saint-Andre
8272e2fffa
accepted for pubilcation
2014-01-23 13:34:26 -07:00
Peter Saint-Andre
690ab3a899
accepted by Council
2014-01-14 11:13:41 -07:00
Peter Saint-Andre
ecd6deb107
0.0.2
2014-01-14 11:09:55 -07:00
Peter Saint-Andre
357599aacb
0.0.1
2014-01-14 01:01:42 -07:00
Peter Saint-Andre
819a921b0e
accepted for publication
2014-01-08 14:16:35 -07:00
Peter Saint-Andre
b8ae1695b7
accepted for publication
2014-01-08 14:13:31 -07:00
Peter Saint-Andre
4003c9dd69
accepted for publication
2014-01-08 14:13:14 -07:00
Peter Saint-Andre
624f4dfa30
approved for publication by XMPP Council
2014-01-08 11:32:53 -07:00
Peter Saint-Andre
7bf0666b67
approved for publication by XMPP Council
2014-01-08 11:32:11 -07:00
Peter Saint-Andre
3cc88a9fe4
0.0.1
2014-01-06 14:54:30 -07:00
Peter Saint-Andre
ce8e9ead82
Merge branch 'master' of athena.jabber.org:xmpp
2013-12-20 13:50:17 -07:00
Peter Saint-Andre
6a0001367d
0.0.4 from Peter Waher
2013-12-20 13:49:53 -07:00
Philipp Hancke
b3c190b4bd
example not taken from 5576
2013-12-18 18:06:44 +01:00
Philipp Hancke
483ee12abe
fix typo
2013-12-18 18:06:31 +01:00
Philipp Hancke
4bc64ff602
removed rfc examples (where necessary) as requested
2013-12-15 17:22:02 +01:00
Philipp Hancke
b505840761
type->semantics, thanks lance
2013-12-06 21:00:26 +01:00
Peter Saint-Andre
d5a9bda61e
order of revision blocks
2013-12-05 06:31:57 -07:00
Peter Saint-Andre
f579f87ef0
0.0.1
2013-12-04 16:29:56 -07:00
Peter Saint-Andre
e14c6b837e
corrected version
2013-12-03 13:47:50 -07:00
Peter Saint-Andre
c651610ff0
incoming proposals
2013-12-03 13:41:06 -07:00
Peter Saint-Andre
56770630c0
0.0.2
2013-12-02 20:17:57 -07:00
Peter Saint-Andre
7b53988278
0.0.2
2013-12-02 18:33:55 -07:00
Peter Saint-Andre
26ecf4bbc1
0.0.2
2013-11-11 07:46:00 -08:00
Peter Saint-Andre
848c901c3d
0.0.1
2013-11-11 07:43:45 -08:00
Peter Saint-Andre
f6197e2174
inbox items
2013-11-07 16:59:57 -08:00
Peter Saint-Andre
c3b7673484
rename
2013-10-25 10:16:21 -06:00
Peter Saint-Andre
6188a42951
0.0.2
2013-10-10 16:46:39 -06:00
Peter Saint-Andre
9851cce546
0.0.1
2013-10-09 09:16:47 -06:00
Peter Saint-Andre
c2392b53ce
0.0.1
2013-09-09 16:32:04 -06:00
Peter Saint-Andre
036bacc8b0
0.0.1
2013-07-25 07:18:21 -06:00
Peter Saint-Andre
44aa0c6cf3
accepted for publication
2013-07-11 10:53:18 -06:00
Peter Saint-Andre
fe19e67fd1
accepted for publication
2013-07-11 10:52:35 -06:00
Peter Saint-Andre
6a662cfa30
accepted for publication
2013-07-11 10:52:05 -06:00
Peter Saint-Andre
8bba31a1d8
0.0.7
2013-07-09 22:04:15 -06:00
Peter Saint-Andre
70e38e055e
0.0.4
2013-07-09 09:28:53 -06:00
Peter Saint-Andre
001c9ec648
accepted by the XMPP Council
2013-06-26 09:32:05 -06:00
Peter Saint-Andre
f3d4862287
0.0.3
2013-06-24 14:03:12 -06:00
Peter Saint-Andre
8e4f9a5d82
0.0.7
2013-06-19 20:27:42 -06:00
Peter Saint-Andre
6eed8f92f6
0.0.1
2013-06-19 20:21:11 -06:00
Peter Saint-Andre
e48b3d5daa
0.0.1
2013-06-12 14:49:01 -06:00
Peter Saint-Andre
4f95a24243
accepted by the XMPP Council
2013-06-12 11:48:24 -06:00
Peter Saint-Andre
0687223e9d
0.0.2
2013-06-12 11:39:40 -06:00
Peter Saint-Andre
b94ed19b7b
0.0.2
2013-06-12 11:33:15 -06:00
Peter Saint-Andre
95e05afa5a
accepted by the Council
2013-06-11 14:30:19 -06:00
Peter Saint-Andre
767ca95260
0.0.1
2013-05-28 14:34:01 -06:00
Peter Saint-Andre
901c54a380
0.0.1
2013-05-28 14:33:56 -06:00
Peter Saint-Andre
554db30c6c
accepted as XEP-0328
2013-05-28 14:24:51 -06:00
Peter Saint-Andre
cae9f3e394
0.0.2
2013-05-22 12:36:47 -06:00
Peter Saint-Andre
a18dc452b2
name corrections
2013-05-09 11:19:31 -06:00
Peter Saint-Andre
b08af57286
0.0.1
2013-05-08 16:24:20 -06:00
Peter Saint-Andre
a42b300d68
ProtoXEP
2013-05-07 07:58:47 -06:00
Peter Saint-Andre
301bb3dfff
ProtoXEP
2013-05-07 07:52:49 -06:00
Peter Saint-Andre
7225135868
accepted by the Council
2013-05-06 20:59:05 -06:00
Peter Saint-Andre
38294a45ec
accepted by the Council
2013-05-06 20:59:00 -06:00
Peter Saint-Andre
f8d329ad36
accepted by the Council
2013-05-06 20:58:47 -06:00
stpeter
cd5d7ff0e5
protoxep
2013-04-16 13:50:08 -06:00
stpeter
19999d5c17
protoxep
2013-04-16 13:50:04 -06:00
stpeter
3f92d3d8dc
protoxep
2013-04-16 13:49:57 -06:00
stpeter
dccead2894
accepted for publication
2013-04-16 13:46:58 -06:00
stpeter
cb90b3f54a
accepted for publication
2013-04-16 13:46:29 -06:00
stpeter
19fac71a6b
accepted for publication
2013-04-16 13:45:45 -06:00
stpeter
995b5ec33b
accepted for publication
2013-04-16 13:45:15 -06:00
stpeter
a097a6609f
accepted for publication
2013-04-16 13:44:45 -06:00
stpeter
52a109d863
0.0.4
2013-04-16 11:26:00 -06:00
Peter Saint-Andre
d30416e3d6
protoxep
2013-03-21 08:28:58 -07:00
Peter Saint-Andre
e60d680e9f
ProtoXEP
2013-03-13 10:33:04 -04:00
Peter Saint-Andre
5c99bc470e
published as XEP-0319
2013-03-04 13:28:23 -07:00
Peter Saint-Andre
210f969cc1
published as XEP-0318
2013-03-04 13:27:58 -07:00
Peter Saint-Andre
732ca534f3
inbox proposals from Tobian Markmann
2013-02-26 11:04:22 -07:00
Peter Saint-Andre
d17e6116cb
Hats accepted by Council
2013-01-03 14:10:54 -07:00
Peter Saint-Andre
d827aac810
MEP accepted by Council
2013-01-03 11:21:03 -07:00
Peter Saint-Andre
3ebbde0d63
added Hats and MEP
2012-12-09 22:18:42 -08:00
Peter Saint-Andre
0b1b8f6ae5
ProtoXEP submission
2012-11-27 10:55:06 -07:00
Peter Saint-Andre
9a57fe4389
rename to XEP-0315
2012-10-15 10:20:30 -06:00
Peter Saint-Andre
e5099cdad9
0.0.1
2012-09-25 11:45:37 -06:00
Peter Saint-Andre
b1136fbf73
to be published as Experimental
2012-07-27 19:54:08 -06:00
Peter Saint-Andre
4152b2f323
0.0.2
2012-06-21 10:42:21 -06:00
Peter Saint-Andre
e3586a88f0
typo
2012-06-19 10:31:28 -06:00
Peter Saint-Andre
f54258e364
revised version from authors
2012-06-19 10:30:09 -06:00
Peter Saint-Andre
5f4cb14050
0.0.1
2012-06-19 10:08:40 -06:00
stpeter
865f97c475
0.0.2
2012-02-29 19:06:24 -07:00
stpeter
09df50be60
0.0.1
2012-02-28 12:49:56 -07:00
stpeter
0501546781
0.0.1
2012-01-23 17:01:04 -07:00
stpeter
b6e7ab753a
Council agreement to publish
2012-01-10 12:16:18 -07:00
stpeter
daa39ba31c
Council agreement to publish
2012-01-10 12:16:13 -07:00
stpeter
e6d70f81a3
Council agreement to publish
2012-01-10 12:16:01 -07:00
stpeter
f7a02f86c1
0.0.3
2012-01-09 20:33:02 -07:00
stpeter
04d16b2a81
0.0.2
2012-01-09 14:17:06 -07:00
stpeter
90fff6b71f
0.0.1
2012-01-06 10:59:04 -07:00
stpeter
c428ed32a3
0.0.1
2012-01-06 10:56:42 -07:00
stpeter
35fb535e33
Merge remote branch 'origin/protoxep/muc-fast-reconnect'
2012-01-06 10:45:39 -07:00