Merge branch 'release-0.3.9' 0.3.9
authorTomás Touceda <chiiph@leap.se>
Fri, 18 Jul 2014 13:58:41 +0000 (10:58 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 18 Jul 2014 13:58:41 +0000 (10:58 -0300)

Trivial merge