K 10 svn:author V 7 vanilla K 8 svn:date V 27 2015-12-08T09:47:38.924279Z K 7 svn:log V 38 Add py-django-pipeline13 to CONFLICT. END