* master:
Moving classifiers when recreating destroyed feeds.
Code to recreateaccidentally destroyed feeds.
Adding SSL certificate assembly fab command.
Skip saved feeds which have fake unread counts.
Fixing saved story view for users with preference to open first unread story, thereby switching them out of saved mode and into unread mode.
Adding copy_db_settings to fabfile.
Fixing specified image sizes.
Only premiums users can share multiple stories from a single feed per day.
Faster delete user (for combating spam).
Boosting XL font size.
* master: (492 commits)
Fixing renewal dialog.
Better feed count for muting.
Preventing dupe stories in feed view.
Adding mute feeds feature for premium users.
Adding auto-activate for flat feeds.
Submitting v4.1.0.
Last beta of ios 4.1 before release.
Showing refresh notifier when returning to app.
Fixing urls for folders with dashes in the title.
Removed transition.
Transitioning from tag to tag/feed_id.
Max of 3 updates per fetch.
Upgrading mongodb mms agent.
Showing saved stories explainer for empty saved stories.
Removing mark read button in story titles bar when on saved view.
Fixing updates_off in tasks.
Adding updates_off run-time setting for handling large spikes of updates.
Draining feeds also clears out error feeds.
Fixing errors with missing story content from ifttt.
OMG, I shipped a 3 second sleep. Doh!
...
Conflicts:
apps/reader/models.py
* master:
Fixing updates_off in tasks.
Adding updates_off run-time setting for handling large spikes of updates.
Draining feeds also clears out error feeds.
* master:
Adding cryptography dependency.
Adding cutoff_timestamp and direction to API docs for marking a feed as read. Meant to address #542.
Showing all feeds in feed chooser.
Gunicorn x-forwarded-for
Adding RealIP to nginx/gunicorn.
Make sure all folders are visible in the feed chooser dialog
Make single-story context actions always appear above multiple-story actions. (#541)
fix to compatible with Python2.6
Add support for SNI and update requests.
