Merge branch 'release-0.3.7' 0.3.7
authorTomás Touceda <chiiph@leap.se>
Fri, 4 Apr 2014 19:19:22 +0000 (16:19 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 4 Apr 2014 19:19:22 +0000 (16:19 -0300)

Trivial merge