Squashed 'emacs.d/color-theme-solarized/' content from commit 9a00193

git-subtree-dir: emacs.d/color-theme-solarized
git-subtree-split: 9a0019332c239a17f0fac310c7d9f08905222522
Merge commit '59ca363d9ddfbda9ed253f379c1ad938cc177865' as 'emacs.d/color-theme-solarized'
Merge commit '58eaa51d72e3380339d3fdc144531bd97634c366' as 'emacs.d/circe'
Squashed 'emacs.d/circe/' content from commit 20a49d0

git-subtree-dir: emacs.d/circe
git-subtree-split: 20a49d0a6f749b3e98052ebcd2d9960269a82f03
Updating merge-submodules.sh
Squashed 'emacs.d/twittering-mode/' changes from 0681411..9c88a88

9c88a88 Display how many tweets are retrieved.
0a9e0fa Add a new command `twittering-get-tweets-before'.
c9e805c Add a new function `twittering-retrieve-timeline'.
7ed54f9 Do not call `force-mode-line-update' via the unread status notifier.
0ffbe8f Request a compressed HTTP response when using `curl'.

git-subtree-dir: emacs.d/twittering-mode
git-subtree-split: 9c88a88d57c6805a938128a2690c55b0509e0763
Merge commit '1d099933f483215518f170a8defd1bfbf56a1b12'
Squashed 'emacs.d/magit/' changes from 446e9d5..ed2164c

ed2164c Merge branch 'mainline-maint' into mainline-master
dc482c5 Don't set GIT_EDITOR if we cannot find emacsclient
60b7faf Merge pull request #484 from dudebout/manual
47b4632 Merge branch 'maint' into 'master'
d10ab11 Documentation for magit-completing-read
c5a6cdc Use a default value when asking for a file to ignore
224a906 Merge pull request #479 from dudebout/gitignore-with-completing-read
d2b16f2 Adds missing double spaces after period ending sentence.
5534fec Rewrote the branching section of the documentation.
97885af Updated the documentation for the branch manager.
8298ef4 Merge pull request #478 into maint
e57433a Cleans up the ignore code containing redundant code and doc.
7d67ff4 Uses the usual completion mechanism of magit for gitignore.
5b6f4c1 Fix typos in CONTRIBUTING.md
19e96be Update copyright in magit.texi
10e4d68 Correct documentation for creating branch
50da363 Make magit-save-buffers on magit-status use the directory we are opening, not the default directory of the buffer we are visiting when called.
5ed79cb Merge branch 'maint'
bd4e9b9 adding contributing guidelines
653caed Merge commit 'fdcc697'
4a39668 Merge branch 'maint'
5599cf1 Merge commit 'c48369b'
a51dc52 README.md: remove reference to outdated cheatsheet
6ef8a0e README.md: fix link to Magit Owners Team
c48369b Add dired-jump support to magit-status-mode.
ef055f1 Merge branch 'maint'
4b16e4a Make .gitignore ignore the `dir` file
588685b Do not raise error from Magit WIP
ba5a849 Expand symbolic links in magit-wip-save
f90bc1e Merge branch 'maint'
3fa3849 #457: Create the directory for local ignores if needed
28379e0 remove cp gnuism
5a2afe7 make a dir file so that the package installs documentation properly
7daf362 Merge branch 'rdparker/topic/fix-magit-filename-symlinks'
3b1d46c Merge commit 'c51637773758ea2c7754245ef614c2cccf0306c0' into rdparker/topic/fix-magit-filename-symlinks
8c5c842 Merge branch 'suhailshergill/bugfix'
bdb97a4 Merge commit '41101b951a29bdad781542ff17de6dc6af52ce5a' into suhailshergill/bugfix
4497cf2 Merge branch 'tarsius/magit-wip'
e6f3e50 fix byte-compilation issue
59ae559 turn-on-magit-wip-save: assert git-wip is available
32a2808 minor commentary fixes
5b3fcce improve magit-wip usage information
fb48835 fix typo
d06f6b9 add myself as maintainer
97a4b6a add kludge for issue #441
2c9e9d4 fix turn-on-magit-wip-save
dc5c6e7 global-magit-wip-save-mode: use magit.extensions mechanism
84c8f51 magit-wip: distinct modes for displaying and committing
5e2e992 magit-wip-mode now actually toggles use of wip refs
5ea1d1e Merge branch 'maint'
7683d27 Run git init with no argument in the correct directory
41101b9 bugfix: make interactive-rebase respect server-name
c516377 Handle symlinks in magit-filename
fdcc697 Added "--" divider to ensure that diff can disambiguate revision and filename.

git-subtree-dir: emacs.d/magit
git-subtree-split: ed2164c316ecbc9c7ecb6b4cd300f610e6fa552b
Merge commit '5ae65972f36547f2503f548fd0fff3a7e9f00f89'
Squashed 'emacs.d/circe/' changes from 20a49d0..80df824

80df824 circe-reconnect: non-blocking connect (for real)
bfb8b66 lcs.el (lcs-with-positions): Actually return a value to avoid "can't happen" (fix from mtp)

git-subtree-dir: emacs.d/circe
git-subtree-split: 80df824cc590f08a5c8e48c7abcb59772e512e1d
Merge commit '8286660f55ad5707e5d8797b9a11608c00277beb'
.emacs updates; including tuareg in solarized.