Merge 0.10->trunk
[prosody.git] / doc / roster_format.txt
2013-05-01 Matthew WildMerge tls branch
2013-05-01 Matthew WildMerge s2s branch
2008-10-24 Matthew WildMerging more s2s
2008-10-23 Matthew WildMaking the best attempt out of a bad merge from waqas
2008-10-23 Waqas HussainMerged from Matthew
2008-10-23 Waqas HussainMerged from Matthew
2008-10-23 Waqas HussainRoster updates
2008-10-23 Waqas HussainDocs update
2008-10-22 Matthew WildMerge roster & presence from waqas
2008-10-12 Waqas HussainDocumented the roster object's structure