Initial commit
no message
Merge commit '70daa0cabca97f74de595a1bd45cd2552b3ebe36' as 'dir1'
Squashed 'dir1/' content from commit 93065b1

git-subtree-dir: dir1
git-subtree-split: 93065b174238b4d7b67832ccfe4c3659529b0c73
no message
Squashed 'dir1/' changes from 93065b1..5ff2084

5ff2084 no message

git-subtree-dir: dir1
git-subtree-split: 5ff208473a67436feb888fe090568b64f6ab9aac
Merge commit 'baea077824ce358e165298abe3a13e89575b2ce5'
no message
Squashed 'gh-pages/' content from commit 3984c7c

git-subtree-dir: gh-pages
git-subtree-split: 3984c7c4ae6687023ff124791d4083c7a934d682
Merge commit '0096bc6dae1b202f4b2cb64b03e0c68ecee4476e' as 'gh-pages'
no message
Split 'gh-pages/' into commit '7a258aaef7de6bc54f5e28b0d90d4c68724a9f6f'

git-subtree-dir: gh-pages
git-subtree-mainline: f8b637bbf524bd4992fc56a96716d9bf15435a91
git-subtree-split: 7a258aaef7de6bc54f5e28b0d90d4c68724a9f6f
no message
Split 'gh-pages/' into commit '89d78f256885fe62b3d5707a7dbbcac4b37d340b'

git-subtree-dir: gh-pages
git-subtree-mainline: b208a6d72bb255ebd8d24b94f47da11f9646d195
git-subtree-split: 89d78f256885fe62b3d5707a7dbbcac4b37d340b
Merge remote-tracking branch 'aze/master'

Conflicts:
	.gitignore
	COPYING
	README
	README.md
	book/sca/COPYING
	book/sca/README
	book/sca/index.html
	book/sca/init.el
	book/sca/snippets/.gitignore
	book/sca/src/.gitignore
	book/sca/starter-kit-bindings.html
	book/sca/starter-kit-defuns.html
	book/sca/starter-kit-eshell.html
	book/sca/starter-kit-g-client.html
	book/sca/starter-kit-gnus.html
	book/sca/starter-kit-haskell.html
	book/sca/starter-kit-js.html
	book/sca/starter-kit-lisp.html
	book/sca/starter-kit-misc-recommended.html
	book/sca/starter-kit-misc.html
	book/sca/starter-kit-misc.org
	book/sca/starter-kit-org.html
	book/sca/starter-kit-perl.html
	book/sca/starter-kit-publish.html
	book/sca/starter-kit-python.html
	book/sca/starter-kit-registers.html
	book/sca/starter-kit-ruby.html
	book/sca/starter-kit-scala.html
	book/sca/starter-kit-yasnippet.html
	book/sca/starter-kit.html
	book/sca/starter-kit.org
	emacs.css
	gh-pages/COPYING
	gh-pages/README
	gh-pages/emacs.css
	gh-pages/index.html
	gh-pages/init.el
	gh-pages/snippets/.gitignore
	gh-pages/src/.gitignore
	gh-pages/starter-kit-bindings.html
	gh-pages/starter-kit-defuns.html
	gh-pages/starter-kit-eshell.html
	gh-pages/starter-kit-g-client.html
	gh-pages/starter-kit-gnus.html
	gh-pages/starter-kit-haskell.html
	gh-pages/starter-kit-js.html
	gh-pages/starter-kit-lisp.html
	gh-pages/starter-kit-misc-recommended.html
	gh-pages/starter-kit-misc.html
	gh-pages/starter-kit-misc.org
	gh-pages/starter-kit-org.html
	gh-pages/starter-kit-perl.html
	gh-pages/starter-kit-publish.html
	gh-pages/starter-kit-python.html
	gh-pages/starter-kit-registers.html
	gh-pages/starter-kit-ruby.html
	gh-pages/starter-kit-scala.html
	gh-pages/starter-kit-yasnippet.html
	gh-pages/starter-kit.html
	gh-pages/starter-kit.org
	index.html
	init.el
	project_b/book/sca2/emacs.css
	snippets/.gitignore
	src/.gitignore
	starter-kit-bindings.html
	starter-kit-defuns.html
	starter-kit-eshell.html
	starter-kit-g-client.html
	starter-kit-gnus.html
	starter-kit-haskell.html
	starter-kit-js.html
	starter-kit-lisp.html
	starter-kit-misc-recommended.html
	starter-kit-misc.html
	starter-kit-misc.org
	starter-kit-org.html
	starter-kit-perl.html
	starter-kit-publish.html
	starter-kit-python.html
	starter-kit-registers.html
	starter-kit-ruby.html
	starter-kit-scala.html
	starter-kit-yasnippet.html
	starter-kit.html
	starter-kit.org