Merge with 0.6.1
authorGiuseppe Penone <giuspen@gmail.com>
Sun, 15 Sep 2013 10:59:03 +0000 (12:59 +0200)
committerGiuseppe Penone <giuspen@gmail.com>
Sun, 15 Sep 2013 10:59:03 +0000 (12:59 +0200)
commit1226b78d47bf889c2f564ea96a12c8303a048868
treee60c05321e60f37354fc23795abe58e25ed63270
parentd7c3a875bd0636149d237970440697c6eaa039d0
parent8a05ac3dbb7a2c2bf2d217f751d08db17b2f456a
Merge with 0.6.1