* master: (42 commits)
Switching to new redis sessions db.
If text fails to fetch, tapping the text button should not change the text lock.
Fixing Feed view space bar scrolling bug where story is collapsed.
Adding new space bar behavior to full view as well.
Fixing space bar scrolling in list view.
Adding 'm' keyboard shortcut to toggle read/unread.
Shift+space goes backwards too.
Jumping to next story when scrolling using space bar.
Handling timeout on original page fetch.
Fixing timeout error on PUSH. Also fixing requests error on page importing.
Boosting timeout on analtics cleaning.
Adding fetch original page to msharedstory.
Fixing switching to and from text mode while still in current feed. Now to change river so that it uses text view setting from feed, not folder (unlike web).
Cutting unneccessary logging.
Adding user agents to logging. Reeder, Fever, Superfeedr, Old Reader, IE11.
Adding modern android app user agent in logging.
Switching back to original redis server for sessions while the new sessions server gets monitored.
Adding redis sessions db.
Making text view sticky on ios. Maybe bugs?
Upgrading to redis 2.8.
...
Conflicts:
media/js/newsblur/reader/reader_preferences.js
* 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: (41 commits)
Fixing A&L Daily bug where stories all have the same GUID and permalink. Using permalink or timestamp, whichever is unique across the feed.
Bumping Android version.
Only hard-recount unreads if there is a mismatch between remote and local.
Ensure correct ordering of mark-actions and count refreshes.
Better overscroll event filtering.
Document new flag.
Don't check for online status too often.
Quicker transition from offline to online mode.
Offline indicator.
Status messaging for count updates.
Ensure refreshed feed counts show immediately.
Throw out reading actions that will never succeed.
Add story fetch setting to feedback debug.
Add network read profiling.
Complete unread recounting after reading sessions.
Monitoring disk usage should fail on error.
Fixing pythonpath for disk monitor.
Adding disk usage monitor to all database servers.
Deleting unstarred story as part of starred story cleanup.
Logging starred story params.
...
* master:
Adding mark_newer_stories_as_read to socialsubs. Uses story date and not shared date, probably to its detriment.
Adding check to paypal resub ipn.
Fix background colour for blurblog share table in dark theme
