dellsystem/wikinotes — pull request #136 by hc5 (2012-04-30 07:36:30+00:00)
Title: added document editing conflict resolution

wiki/utils/_patiencediff_py.py
wiki/utils/merge3.py
wiki/utils/patiencediff.py

are taken from http://code.google.com/p/django-pad/source/browse/trunk/wiki/, licenced under GPL.