Comparison

TODO @ 4940:39781d4d3173

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 05 Jul 2012 17:40:12 +0100 (2012-07-05)
parent 4938:76a960bff4c7
child 5405:4f98f2f60e22
comparison
equal deleted inserted replaced
4932:212e81ac6ebb 4940:39781d4d3173
3 - SASL EXTERNAL 3 - SASL EXTERNAL
4 - Roster providers 4 - Roster providers
5 - Web interface 5 - Web interface
6 6
7 == 1.0 == 7 == 1.0 ==
8 - Statistics
8 - Clustering 9 - Clustering
9 - World domination 10 - World domination