Merge branch 'release-0.3.7' 0.3.7
authorTomás Touceda <chiiph@leap.se>
Fri, 6 Dec 2013 18:34:13 +0000 (15:34 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 6 Dec 2013 18:34:13 +0000 (15:34 -0300)

Trivial merge