* master: (29 commits)
Adding new preference for wrapping story content either at 700px or edge of screen.
Bumping Android to v4.2.1.
Work around API change that throws out hidden stories and vends blank pages. (#664)
Fixing duplicate Pocket share extension message.
Don't cache super-small images.
Don't use cache filenames that are impossible to debug.
Fix image prefetch for protocol-hopping redirects.
Keep action replays around until there is less risk of them being needed.
Overhaul and simplify nextUnread search algo. (#640)
Ensure recounts don't get stuck behind story page requests.
Updating push logging message when skipping.
v4.2.0 of android app.
New maintenance message.
Updating fabfile to handle psycopg2/pgbouncer.
Tweak load throb anim speed for stock devices.
Tweak and comment new story list loading indicator.
Move story list loader to correct position. (#582)
New loading-progress animation for story lists. (#582)
Chopping off milliseconds in push delta.
Chopping off milliseconds in push delta.
...
* master: (238 commits)
Upping ios to v4.6.4.
Including hidden stories in fetch. Also fixing send to button in story settings cog.
Less ifs when handling volume key
Add preference for volume key navigation
Override volume key for next/prev navigation in reading activity
Adding an include_hidden parameter to single feeds and rivers, defaulting to false. Clients that don't use hidden stories but use paging as an indicator will need to account for a hidden_stories_count field, as indicating in the API docs.
Bumping Android version to 4.2.0b1.
Disable debug.
Updating oauth toolkit to fix admin issues.
Better algorithm for image cache cleanup. (#627)
Unescape HTML entities in image alt text. (#652)
Redraw overlay buttons slightly less often when scrolling.
Resource-ify sync status messages.
Fix story sync status indication. (#644)
Adding autocomplete ignores.
Remove last traces of the legacy DB!
Migrate comment replies off of legacy DB.
Migrate user profiles off of legacy DB.
Start migrating comments from legacy DB.
Fix crash when updating old comments.
...
* master:
Preventing brentozar.com from being subscribed to because their lawyer sent me a Cease and Desist nastygram.
Adding lisp syntax highlighting. Also upgrading syntax highlighter.
Per @IFTTT's request, changing ifttt key to meta.
Make full mark-read action lifecycle recount stories, not just first mark.
Improve chaining of updated cursor data from Reading activity down through to adapter and fragments.
