summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2008-12-28 15:12:11 -0500
committerJoey Hess <joey@gnu.kitenet.net>2008-12-28 15:12:11 -0500
commit17b2afe721d5b8fd2468fca56e91fe83bf49be64 (patch)
tree3bcac2926d96743b98dfef87baf336247447b71e /po
parent25879952b1359bcd62dba33f2364c77442358832 (diff)
parent82d94d4d4a8768e4d741bd37fc3b805260f775b1 (diff)
Merge branch 'master' into next
Conflicts: debian/changelog po/ikiwiki.pot
Diffstat (limited to 'po')
-rw-r--r--po/ikiwiki.pot2
1 files changed, 1 insertions, 1 deletions
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index bfbaaf0fa..7f664d111 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-26 21:41-0500\n"
+"POT-Creation-Date: 2008-12-28 15:01-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"