summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-09-01 11:26:40 +0200
committerJonas Smedegaard <dr@jones.dk>2010-09-01 11:26:40 +0200
commited170b0be134f1fa71d7f6b8fa5e606bfe0cbaed (patch)
treef3036b27ccbf1ec54eafe9f85d4abc091b00445c
parentefe833487f4f1da011f872866cfe5f751732bbcd (diff)
parent2157a414e29a23310c0ac84bd81c5fdc943ef8ca (diff)
Merge branch 'allinone-da' into allinone-multilang
Conflicts (changes suppressed): ikiwiki_da_admin.setup
0 files changed, 0 insertions, 0 deletions