K 10 svn:author V 6 eadler K 8 svn:date V 27 2012-06-02T04:59:01.000000Z K 7 svn:log V 97 Fix conflicts line - glob, not regex Submitted by: Sulev-Madis "ketas" Silber END