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

Trivial merge