Merge branch 'master' into release-0.2.5
authorTomás Touceda <chiiph@leap.se>
Fri, 28 Jun 2013 17:55:22 +0000 (14:55 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 28 Jun 2013 17:55:22 +0000 (14:55 -0300)

Trivial merge