Merge branch 'release-0.3.6' 0.3.6
authorTomás Touceda <chiiph@leap.se>
Fri, 6 Dec 2013 18:24:39 +0000 (15:24 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 6 Dec 2013 18:24:39 +0000 (15:24 -0300)
commit25ef3a640bb6e7877487a6300c065635092c92c0
treed49727aca0e783c4a8423f2316c79df059026ce4
parent5be557db1e5eff7fec71e1c65b0cbb4cb54c2ba6
parentf150ad80f95f337bd8587d562868ad9cc91ba77e
Merge branch 'release-0.3.6'