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)

Trivial merge