benfitzpatrick/rose — pull request #1 by arjclark (2013-02-11 14:10:43+00:00)
Title: Doc conflict

should fix it.