Merge remote-tracking branch 'refs/remotes/ivan/feature/add-email-string-sender'
authorTomás Touceda <chiiph@leap.se>
Wed, 22 Jan 2014 17:48:51 +0000 (14:48 -0300)
committerTomás Touceda <chiiph@leap.se>
Wed, 22 Jan 2014 17:48:51 +0000 (14:48 -0300)

Trivial merge