Split XEP into bite-sized tasty chunks
Merge branch 'master' of github.com:buddycloud/buddycloud-xep