Merge branch 'release-0.3.1'
authorTomás Touceda <chiiph@leap.se>
Fri, 23 Aug 2013 14:46:17 +0000 (11:46 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 23 Aug 2013 14:46:17 +0000 (11:46 -0300)

Trivial merge