local changes to build-init
Merge branch 'master' of git@github.com:lisp/de.setf.resource
Merge branch 'master' of git@github.com:lisp/de.setf.resource
Merge branch 'master' of git@github.com:lisp/de.setf.resource
Merge branch 'master' of git@github.com:lisp/de.setf.resource
Merge branch 'master' of git@github.com:lisp/de.setf.resource
Merge branch 'master' of git@github.com:lisp/de.setf.resource
Merge branch 'master' of git@github.com:lisp/de.setf.resource
Merge branch 'master' of git@github.com:lisp/de.setf.resource
Merge branch 'master' of git@github.com:lisp/de.setf.resource
Merge branch 'master' of git@github.com:lisp/de.setf.resource
resolved merge
Merge branch 'master' of git@github.com:lisp/de.setf.resource
Merge branch 'master' of git@github.com:lisp/de.setf.resource
Merge branch 'master' of git@github.com:lisp/de.setf.resource
Merge branch 'master' of git@github.com:lisp/de.setf.resource
Merge branch 'master' of git@github.com:lisp/de.setf.resource
Merge branch 'master' of git@github.com:lisp/de.setf.resource
Merge branch 'master' of github.com:lisp/de.setf.resource
Merge branch 'master' of github.com:lisp/de.setf.resource