Merge branch 'release-0.3.8' 0.3.8
authorTomás Touceda <chiiph@leap.se>
Fri, 6 Jun 2014 16:17:27 +0000 (13:17 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 6 Jun 2014 16:17:27 +0000 (13:17 -0300)

Trivial merge