Merge branch 'namespaced' of git://tremily.us/swc-version-control-git into assembled