Merge remote-tracking branch 'refs/remotes/ivan/feature/delivery-format-test-mail' master
authorTomás Touceda <chiiph@leap.se>
Fri, 31 Jan 2014 17:08:44 +0000 (14:08 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 31 Jan 2014 17:08:44 +0000 (14:08 -0300)

Trivial merge