K 10 svn:author V 3 cpm K 8 svn:date V 27 2016-07-05T15:10:20.729593Z K 7 svn:log V 202 - Register CONFLICTS between py-uritemplate and py-uritemplate.py Submitted by: me Reviewed by: amdmi3, junovitch, feld (mentors) Approved by: maintainer timeout (3 weeks) Differential Revision: D6730 END