[[!comment format=mdwn
 username="http://joeyh.name/"
 ip="209.250.56.244"
 subject="comment 6"
 date="2014-04-07T22:17:16Z"
 content="""
Does the git log have any recent commits that were \"git-annex automatic merge conflict fix\" ?
"""]]