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
update docs to clone 5.0 rather than master
start testing mysql role
try to load elgg
put the tag in meta xsce-addons
declare dependency
new variable format
Merge branch 'mysql' of https://github.com/georgejhunt/xsce

do the merge