Merge remote-tracking branch 'refs/remotes/drebs/bug/4475_use-couch-document' into develop2013-12-19T14:41:50+00:00Tomás Toucedachiiph@leap.se2013-12-19T14:41:50+00:00df58fb83cf7278a9d2e2ddb278fa9a0b314e88bb
Conflicts:
src/leap/mx/mail_receiver.py
Conflicts:
src/leap/mx/mail_receiver.py
Merge remote-tracking branch 'chiiph/bug/multiple_encoding' into develop2013-12-17T19:06:52+00:00Ivan Alejandroivanalejandro0@gmail.com2013-12-17T19:06:52+00:00d7418f5b90b0731b28973c29d3b4ed3e9a0edaf4
Ignore encoding, use message.as_string directly.2013-12-17T17:49:50+00:00Tomás Toucedachiiph@leap.se2013-12-17T17:49:50+00:0059c65be76e4ba69c53787250dc964aea1d394514
The message is already in str type, so we don't care about
encoding. json.dumps will ignore convertion.
The message is already in str type, so we don't care about
encoding. json.dumps will ignore convertion.
Use CouchDocument from new backend (#4475).2013-12-16T13:20:14+00:00drebsdrebs@leap.se2013-12-16T13:20:14+00:0045f957d559940be343820c1b72674e0bfc2dbd62