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