crowbar/barclamp-crowbar — pull request #1009 by vuntz (2014-04-10 13:51:09+00:00)
Title: Sync with roxy

Manually cherry-picked commits not in stoney yet.