reddit/reddit — pull request #765 by andre-d (2013-05-08 22:28:33+00:00)
Title: wiki: unsafe() diff html on conflict.

Fixes #755, was caused by a safety net put in place with 102ef36