[SCM] live-manual branch, debian, updated. debian/3.0_a1-1-33-g3a6dfff

[José Luis Zabalza]

The following commit has been merged in the debian branch:
commit 0bdee1910769583bd255a56c2d78d49932578c10
Merge: 517ee8b34f674c01f1c12e21c84bb3617b4eb073 d754eb54dba79ce7d460e51acaf51b85da612e11
Author: José Luis Zabalza <jlz.3008 at gmail.com>
Date:   Sun Feb 20 21:32:20 2011 +0000

    translating user_customization-contents.ssi.po to ES

diff --combined manual/pot/live-manual.ssm.pot
index 0543c7d,f468b50..0c90375
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@@ -7,7 -7,7 +7,11 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: live-manual VERSION\n"
++<<<<<<< HEAD
 +"POT-Creation-Date: 2011-02-20 21:24+0000\n"
++=======
+ "POT-Creation-Date: 2011-02-20 16:14+0100\n"
++>>>>>>> d754eb54dba79ce7d460e51acaf51b85da612e11
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
  "Language-Team: LANGUAGE <LL at li.org>\n"

-- 
live-manual