pulp/pulp — pull request #269 by jortel (2013-01-28 20:05:20+00:00)
Title: Citrus staging to master

Citrus feature review before merging to master.