summaryrefslogtreecommitdiff
path: root/blends
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2012-05-11 00:23:52 +0200
committerJonas Smedegaard <dr@jones.dk>2012-05-11 00:23:52 +0200
commit243b81587bfa04235384bde0b173ee46be9f5b3f (patch)
tree5f56959af5a23695ff3d7b0df00651af0bf5f29a /blends
parent7717b154e6e1ecc2511e968e323ae1e8c2883407 (diff)
parentd8b90bd8c0f4c1e9410d228b513fe4c64e302b59 (diff)
Merge branch 'master' of coreander.jones.dk:/srv/git/source.jones.dk/jones/content
Conflicts: blends/asia2011/london.da.po
Diffstat (limited to 'blends')
-rw-r--r--blends/asia2011/london.da.po2
1 files changed, 1 insertions, 1 deletions
diff --git a/blends/asia2011/london.da.po b/blends/asia2011/london.da.po
index 906fcf0..0c24b23 100644
--- a/blends/asia2011/london.da.po
+++ b/blends/asia2011/london.da.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: dr.jones.dk website\n"
-"POT-Creation-Date: 2012-03-06 01:36+0100\n"
+"POT-Creation-Date: 2012-03-06 13:09+0100\n"
"PO-Revision-Date: 2011-11-10 19:42+0700\n"
"Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"