[[!comment format=mdwn
 username="http://johan.kiviniemi.name/"
 nickname="Johan"
 subject="comment 8"
 date="2014-04-07T22:48:18Z"
 content="""
There are no commits in `master` or `git-annex` that have the word conflict in the description.
"""]]