Merge branch 'master' of https://github.com/XSCE/xsce
resolve conflicts in roles/tasks/main
Merge branch 'master' of https://github.com/georgejhunt/xsce
complete the merge
Merge branch 'master' of https://github.com/georgejhunt/xsce
fix merge
Merge branch 'master' of https://github.com/XSCE/xsce
Merge branch 'master' of https://github.com/georgejhunt/xsce
Merge branch 'master' of https://github.com/georgejhunt/xsce

get in sync
Merge branch 'master' of https://github.com/XSCE/xsce

get in sync with upstream
Merge branch 'master' of https://github.com/georgejhunt/xsce

What did I put in github that this machine does not know about?
Merge branch 'master' of https://github.com/georgejhunt/xsce

upstream and origin got out of sync
:`
Merge branch 'master' of https://github.com/XSCE/xsce

Long time since a pull
activitycentra.com => unleashkids.org
update docs to clone 5.0 rather than master
update docs to clone 5.0 rather than master
in docs, clone a real branch rather than just a tag, because the HEAD moves automatically, in case we forget to move the tag when we add a fix
Merge pull request #128 from georgejhunt/release-5.0

Release 5.0 -- Change the INSTALL docs to clone the release-5.0 branch
start testing mysql role
try to load elgg