summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-10 14:24:38 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-10 14:24:38 +0200
commit207ac2343b5dd658f3d380dd92d1260fb2135b43 (patch)
treedb36e1159897da3b8ae26a21b9599a7f9d5e55ee /po
parent84548401b3eb8275ed764926c593c148cf50043c (diff)
parente595e37450ff6c0971924f3e7b461febe4fd1ebb (diff)
Merge branch 'master' into nonedit
Conflicts (manually resolved): Makefile
Diffstat (limited to 'po')
0 files changed, 0 insertions, 0 deletions