K 10 svn:author V 2 pi K 8 svn:date V 27 2017-10-09T18:58:36.911270Z K 7 svn:log V 74 net/quagga{-esr}: add conflicts - detected by rodrigo's conflict scanner END