diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2008-12-28 15:12:11 -0500 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2008-12-28 15:12:11 -0500 |
| commit | 17b2afe721d5b8fd2468fca56e91fe83bf49be64 (patch) | |
| tree | 3bcac2926d96743b98dfef87baf336247447b71e /po/ikiwiki.pot | |
| parent | 25879952b1359bcd62dba33f2364c77442358832 (diff) | |
| parent | 82d94d4d4a8768e4d741bd37fc3b805260f775b1 (diff) | |
| download | ikiwiki-17b2afe721d5b8fd2468fca56e91fe83bf49be64.tar ikiwiki-17b2afe721d5b8fd2468fca56e91fe83bf49be64.tar.gz | |
Merge branch 'master' into next
Conflicts:
debian/changelog
po/ikiwiki.pot
Diffstat (limited to 'po/ikiwiki.pot')
| -rw-r--r-- | po/ikiwiki.pot | 2 |
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" |