Merge remote-tracking branch 'refs/remotes/ivan/feature/more-conflictive-mails'
authorTomás Touceda <chiiph@leap.se>
Thu, 30 Jan 2014 15:01:13 +0000 (12:01 -0300)
committerTomás Touceda <chiiph@leap.se>
Thu, 30 Jan 2014 15:01:13 +0000 (12:01 -0300)

Trivial merge