Merge branch 'release-0.3.0'
authorTomás Touceda <chiiph@leap.se>
Fri, 9 Aug 2013 17:34:01 +0000 (14:34 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 9 Aug 2013 17:34:01 +0000 (14:34 -0300)

Trivial merge