K 10
svn:author
V 5
riggs
K 8
svn:date
V 27
2016-12-25T17:52:11.744210Z
K 7
svn:log
V 50
Register CONFLICTS with ccnet-server

PR:		215292

END