Rev 5217: Merge cleanup into texinfo fixing conflicts in file:///home/vila/src/bzr/bugs/219334-texinfo/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/219334-texinfo/

------------------------------------------------------------
revno: 5217 [merge]
revision-id: v.ladeuil+lp at free.fr-20100705155019-fykb7mup612c7v2b
parent: v.ladeuil+lp at free.fr-20100705124028-7k7z5wq81z9motou
parent: v.ladeuil+lp at free.fr-20100705125001-9974k7g3ihi8gg9u
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: texinfo
timestamp: Mon 2010-07-05 17:50:19 +0200
message:
  Merge cleanup into texinfo fixing conflicts
modified:
  bzrlib/doc_generate/conf.py    sphinx_conf.py-20090908163544-ajoym05j0fmvn3sh-1
-------------- next part --------------
=== modified file 'bzrlib/doc_generate/conf.py'
--- a/bzrlib/doc_generate/conf.py	2010-04-29 16:10:59 +0000
+++ b/bzrlib/doc_generate/conf.py	2010-07-05 15:50:19 +0000
@@ -38,7 +38,7 @@
 
 # General information about the project.
 project = u'Bazaar'
-copyright = u'2010, Canonical Ltd'
+copyright = u'2009, 2010, Canonical Ltd'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the