Merge branch 'release-0.3.6' 0.3.6
authorTomás Touceda <chiiph@leap.se>
Fri, 15 Nov 2013 13:04:50 +0000 (10:04 -0300)
committerTomás Touceda <chiiph@leap.se>
Fri, 15 Nov 2013 13:04:50 +0000 (10:04 -0300)
commitae80ea1f0a748c2746026bd1a17815d786722b84
treecb1809f49f532422e54cf8b30e829f87c88847a5
parenta22efb595cee79fbcab830d8024a173a6a68d6aa
parentb4b46883df55ffeccfdda975f0b61b32436d8ee8
Merge branch 'release-0.3.6'