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

Trivial merge