diff options
author | Craig Andrews <candrews@integralblue.com> | 2009-07-17 12:33:56 -0400 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2009-07-17 12:33:56 -0400 |
commit | 3dbbefd5ad63679162659ce736e9e556f2efff21 (patch) | |
tree | 7ba64f6b02c7f5f0d7d005bc15f7cb729ddf2815 /extlib/XMPPHP/Roster.php | |
parent | 9b372f5bb7638d5d9b4e48ae425d921bc8559235 (diff) | |
parent | 9ed117dc3a405175359d0a541dddfb14cdf15d47 (diff) |
Merge branch 'oembed-provider' into 0.8.x
Diffstat (limited to 'extlib/XMPPHP/Roster.php')
0 files changed, 0 insertions, 0 deletions