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