respond to chrysn's feedback, update branch accordingly
[ikiwiki] / doc / todo / conflict_free_comment_merges.mdwn
2013-07-11  Joey Hessikiwiki (3.20130711) unstable; urgency=low
2010-08-27  Jonas SmedegaardMerge branch 'master' of git://git.ikiwiki.info
2010-06-25  intrigeriMerge remote branch 'upstream/master' into prv/po
2010-04-17  Joey HessMerge remote branch 'davrieb/autotag' into autotag
2010-02-19  Joey HessMerge branch 'master' of ssh://git.ikiwiki.info/srv...
2010-02-19  http://jmtd.livejo... fix 'done' link
2010-01-02  Joey HessMerge remote branch 'tove/master'
2009-12-30  Joey Hesscomments: Add a checksum to the name of comment pages...
2009-12-28  Joey Hessidea