Merge branch 'master' of debian@coreander:/srv/git/source.jones.dk/ikiwiki

Manually resolved conflicts:

	.gitignore
	Makefile
	ikiwiki.setup

1 files changed, 11 insertions, 0 deletions

diff --git a/TODO b/TODO
new file mode 100644
index 0000000..0ba1699
--- /dev/null
+++ b/TODO
@@ -0,0 +1,11 @@
+Stuff that ought to be changed
+==============================
+
+Restructure l10n directories
+----------------------------
+
+Current l10n directory structure was made to mimic that of the 3rd party lang
+plugin.
+
+Some plugins, notably the smiley plugin, however, expect to find its add-on
+underlay beside the core underlay directory, which breaks currently.