vanilla/vanilla — pull request #2115 by hgtonight (2014-09-22 13:24:55+00:00)
Title: Remove new RegardingUserID when merging activity items

Fixes #1776 for 2.1