summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* dev-ml/merlin: bump to 2.5.5Alexis Ballier2017-06-151-0/+33
Package-Manager: Portage-2.3.6, Repoman-2.3.2