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

Trivial merge