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