commit 16036bebae226d3f7059fbf40dcd87ada267d36a Merge: bbae113 54ebdf8 Author: ilv ilv@users.noreply.github.com Date: Tue Nov 3 16:34:00 2015 -0300

Merge branch 'develop'

gettor/smtp.py | 2 +- gettor/twitter.py | 19 +++++++++---------- gettor/xmpp.py | 2 +- process_tweets.py | 19 ++++++++++++++++--- 4 files changed, 27 insertions(+), 15 deletions(-)