Merge branch 'release-0.2.6' into develop
authorTomás Touceda <chiiph@leap.se>
Fri, 12 Jul 2013 17:53:34 +0000 (14:53 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 12 Jul 2013 17:53:34 +0000 (14:53 -0300)

Trivial merge