Merge branch 'release-0.3.4' 0.3.4
authorTomás Touceda <chiiph@leap.se>
Fri, 18 Oct 2013 12:16:54 +0000 (09:16 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 18 Oct 2013 12:16:54 +0000 (09:16 -0300)

Trivial merge