Merge branch 'release-0.3.5' 0.3.5
authorTomás Touceda <chiiph@leap.se>
Fri, 1 Nov 2013 13:30:22 +0000 (10:30 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 1 Nov 2013 13:30:22 +0000 (10:30 -0300)

Trivial merge