phpDocumentor/phpDocumentor2 — pull request #1311 by flip111 (2014-06-04 12:49:45+00:00)
Title: Updated parsedown dependency

conflicted with another library https://github.com/justinwalsh/daux.io/blob/master/composer.json#L16