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