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)
commitf659de6e98073dc738b8d245e0ddb897f5bd3779
treee7bb8041f7f1133323bdce79c24814d26b2726f9
parent858244c7897ae2884d0b9d596acb3a2c7becbdbf
parent9bd0262664a5cc50957646908af8fe7c92b00cc8
Merge branch 'release-0.2.6' into develop