From: Mikael Magnusson <mikachu@comhem.se>
Date: Mon, 3 Mar 2008 16:07:59 +0000 (+0100)
Subject: Merge branch 'backport' into 3.4
X-Git-Tag: release-3.4.7-pre3~3
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=241b41273a7cd93c142817240f7ed6dbb759f86d;p=mikachu%2Fopenbox.git

Merge branch 'backport' into 3.4
---

241b41273a7cd93c142817240f7ed6dbb759f86d
diff --cc po/en@boldquot.po
index dade8521,c384063c..973e167c
--- a/po/en@boldquot.po
+++ b/po/en@boldquot.po
@@@ -30,10 -30,10 +30,10 @@@
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: openbox 3.999.0\n"
 +"Project-Id-Version: openbox 3.4.7-pre1\n"
  "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
- "POT-Creation-Date: 2008-03-02 18:34-0500\n"
- "PO-Revision-Date: 2008-03-02 18:34-0500\n"
+ "POT-Creation-Date: 2008-03-03 02:10+0100\n"
+ "PO-Revision-Date: 2008-03-03 02:10+0100\n"
  "Last-Translator: Automatically generated\n"
  "Language-Team: none\n"
  "MIME-Version: 1.0\n"
diff --cc po/en@quot.po
index b702f8cb,0241f832..2c6fab81
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@@ -27,10 -27,10 +27,10 @@@
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: openbox 3.999.0\n"
 +"Project-Id-Version: openbox 3.4.7-pre1\n"
  "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
- "POT-Creation-Date: 2008-03-02 18:34-0500\n"
- "PO-Revision-Date: 2008-03-02 18:34-0500\n"
+ "POT-Creation-Date: 2008-03-03 02:10+0100\n"
+ "PO-Revision-Date: 2008-03-03 02:10+0100\n"
  "Last-Translator: Automatically generated\n"
  "Language-Team: none\n"
  "MIME-Version: 1.0\n"