K 10
svn:author
V 6
amdmi3
K 8
svn:date
V 27
2015-12-29T17:50:14.663221Z
K 7
svn:log
V 87
- Fix conflicts between linux-sublime and linux-sublime3

Approved by:	portmgr blanket

END