summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-19 18:32:52 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-19 18:32:52 +0200
commitc99ca86c05238594c7f0b9f7e4beedcb035ad5e3 (patch)
treed36cd804fc2e5f290efc63a956879ab467da6764
parentdd89cca6b1e87442279d065526a86fbb616345f2 (diff)
parent16439f59d610d797066ea0c68e672233e55897fc (diff)
Merge branch '_multilang' into allinone-multilang
Conflicts (sync submodule basewiki with HEAD of allinone): basewiki
0 files changed, 0 insertions, 0 deletions