Merge branch 'release-0.3.4' 0.3.4
authorTomás Touceda <chiiph@leap.se>
Fri, 4 Oct 2013 14:19:03 +0000 (11:19 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 4 Oct 2013 14:19:03 +0000 (11:19 -0300)

Trivial merge