Filter out interdiffs from the attachments
Fix the patch-finding algorithm, once and for all.
Merge branch 'dawehner-master'