Merge branch 'release-0.3.6' 0.3.6
authorTomás Touceda <chiiph@leap.se>
Fri, 15 Nov 2013 13:04:50 +0000 (10:04 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 15 Nov 2013 13:04:50 +0000 (10:04 -0300)

Trivial merge