first cut at svn merge and conflict
-rw-r--r-- 17989 GPL
drwxr-xr-x - IkiWiki
-rwxr-xr-x 606 Makefile.PL
drwxr-xr-x - debian
drwxr-xr-x - doc
-rwxr-xr-x 31501 ikiwiki
-rwxr-xr-x 447 mdwn2man
drwxr-xr-x - templates