Tobias Berner Sun, 12 Mar 2017 09:51:55 -0700
SVN commit 13768 by tcberner: Fix comment, and remove CONFLICTS line
M +1 -3 Makefile