Squashed 'emacs.d/popwin-el/' content from commit b6ac46b

git-subtree-dir: emacs.d/popwin-el
git-subtree-split: b6ac46b65acb15894ae9ae34686945369d798e93
Merge commit 'c53c1738fab886ec521f1fb6de3eeacdbc80edbf' as 'emacs.d/popwin-el'
Squashed 'emacs.d/nxhtml/' changes from a286f94..f490ce7

f490ce7 Merge branch 'master' of git://github.com/emacsmirror/nxhtml
bcfc026 Beta 2.09
8e31184 Beta 2.09
760d554 beta 2.09
d4e0ebe beta 2.09
09fcf99 beta 2.09
5036f8e beta 2.09
6db759e beta 2.09
d20127e beta 2.09
f8fd89c beta 2.09
e7bc84f beta 2.09
25ef7f8 beta 2.09
d43344b beta 2.09
6603bf3 beta 2.09
89d3f5a beta 2.09

git-subtree-dir: emacs.d/nxhtml
git-subtree-split: f490ce750549018e45c675bc4d6cd706b4a2770a
Merge commit '2c105bf18fa5287bfb4e6973fb7357c433321ab9'
Squashed 'emacs.d/rainbow-delimiters/' content from commit d38744e

git-subtree-dir: emacs.d/rainbow-delimiters
git-subtree-split: d38744e9453cbe33ae2d28d76fa847d0611eb4c6
Merge commit '2242d5361b42b5a9da61c734eaf4be12248f9109' as 'emacs.d/rainbow-delimiters'
Update .gitignore; merge-submodules.
Squashed 'emacs.d/markdown-mode/' content from commit b664a7b

git-subtree-dir: emacs.d/markdown-mode
git-subtree-split: b664a7b01342d38e096044899a0423a9c4071c1d
Merge commit '9c5676f787feb1ef7bf6b35760f6f9a248360d09' as 'emacs.d/markdown-mode'
Lots of .emacs updates.
Squashed 'emacs.d/color-theme-solarized/' changes from 9a00193..dc8ef43

dc8ef43 Ignore byte-compiled files.
ec7dc87 Merge pull request #83 from hadronzoo/master
4679874 Merge pull request #78 from leea/shell-term-colors
e0a5180 Add support for bm.el
5260834 Add support for git-gutter
c4b1bc3 Some more info for bug reporting.
bbb826a Merge pull request #79 from iainbeeston/patch-1
7778688 Added instructions for installing via marmalade
b60a4d0 Adding colors for shell-mode and term-mode
bb4897a Merge pull request #69 from lewang/fix-widget-border
0721cb2 Merge pull request #74 from mwolson/master
86c2994 Make keywords orange
cb7ebc8 Add support for ERC
2a4d1f9 tone down widget-field border brightness

git-subtree-dir: emacs.d/color-theme-solarized
git-subtree-split: dc8ef43724e2f4c4018dba2356854aca49deab71
Merge commit 'c78daca6fa56083611cd33eb8edf4f8221c5bcd3'

Conflicts:
	emacs.d/color-theme-solarized/solarized-definitions.el
Add mumamo faces.
Remove mmm; more updates.
Really rip out mmm.
Merge commit 'ff52b60e139040e954a97d02c744772eb9ebe171' as 'emacs.d/web-mode'
Squashed 'emacs.d/web-mode/' content from commit 4acb3df

git-subtree-dir: emacs.d/web-mode
git-subtree-split: 4acb3df390bf4af6dbc7d84acf31f321d6b83fc5
Add web-mode.
Gracefully handle emacs 23.
Squashed 'emacs.d/twittering-mode/' changes from c692ee9..a65362d

a65362d Fix the bug that retrieved tweets may not be rendered. Thanks to irie who reported the problem.
f802da3 Fix the bug that a hook may be invoked twice for the same timeline.
27e7f3a Release the version 3.0.0.
bd67e3d Add ChangeLog for the contribution by tomykaira.
fa40325 Check effective length of tweet when posting from minibuffer
31312fa Reduce API rate limit information on mode-line.
fb1ce5b Suppress an error on a sentinel.
48ae644 Replace `delete-dups' with `twittering-remove-duplicates'.
e49c4bc Display rate-limit information for each API.
d9c2e5e Add `twittering-assoc-string' for portability.
e71e292 Decode surrogate pairs in strings returned by `json-read'. Thanks to multiSnow who reported the problem.
4372eac Confirm that `json.el' and SSL are available for the new API.
0dce710 Invoke an API with an authentication header correctly.
8c43a68 Fix the function parsing timelines related to direct messages.
45dee6f Bind a local variable correctly.
0b4ce86 Fix the function of rendering a replied tweet.
146caa6 Fix a typo in the function retrieving the retweet_of_me timeline.
7773152 The timeline spec string "@" means the mentions timeline.
0b52117 Move the cursor to the tweet that will be retrieved.
dd00063 Support the Twitter REST API v1.1.
2e22358 Separate the current core of `twittering-call-api-with-account'.
9f76e79 Support the HTTP cookie.
cdd8e32 Access an account information indirectly.
4cd9c9c Add functions to make an authentication string from an alist.
93de2a8 Add a new function `twittering-call-api-with-account'.
c983fa0 Update the server info only when receiving a response from Twitter.
cb802d4 Sort newly retrieved tweets before rendering them.
e3f0a22 Use the JSON format for retrieving server configuration if possible.
6881dd5 Use the JSON format for posting a status if possible.
b582e2f Use the JSON format for retrieving list information if possible.
605377a Support different intervals of retrieving timelines.
8a6b352 Fix a return value of `twittering-render-replied-statuses'. Thanks to Ikumi Keita who reported the problem.
125fb90 Fix the jojo-mode that caused an error. Thanks to the anonymous person who reported the problem.
8588b40 Avoid rendering same tweets repeatedly.
bcde106 Update the regexp for extracting an ID from a tweet.
6bc9fc7 Update 'README.markdown'.
27f23eb Fix a bug of backward retrieval of favorites timeline. Thanks to the anonymous person who reported the problem.

git-subtree-dir: emacs.d/twittering-mode
git-subtree-split: a65362daf6ae967d907f52ab3f5ffca5001be56f