K 10
svn:author
V 8
madpilot
K 8
svn:date
V 27
2012-06-02T17:01:43.000000Z
K 7
svn:log
V 187
- Fix conflicts

While I'm here take maintainership of x11/trayer

Reported by:	Sulev-Madis "ketas" Silber <madis555@hot.ee> (by e-mail)
Approved by:	crees, tabthorpe (mentors, implicit)

END