pulp/pulp — pull request #1300 by asmacdo (2014-11-14 20:54:13+00:00)
Title: merge two diverged contribution docs

Fixes an issue that happened when I merged a 2.5 docs change forward to master (which had moved those files).