SVN commit 13104 by tcberner: svn merge -cr13103 ^/branches/plasma5 _M . (directory) M +2 -2 PORTS/www/otter-browser/Makefile M +3 -2 PORTS/www/otter-browser/distinfo