summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* dev-ml/merlin: bump to 2.5.4Alexis Ballier2017-04-251-0/+33
Package-Manager: Portage-2.3.5, Repoman-2.3.2