Merge branch 'datechange' of https://github.com/bretep/salt into develop

This commit is contained in:
Seth House 2012-02-10 10:43:45 -07:00
commit c00ac38dad

View File

@ -74,7 +74,7 @@ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
# -- General configuration -----------------------------------------------------
project = u'Salt'
copyright = u'2011, Thomas S. Hatch'
copyright = u'2012, Thomas S. Hatch'
version = __version__
release = version
@ -177,7 +177,7 @@ man_pages = [
epub_title = u'Salt Documentation'
epub_author = u'Thomas S. Hatch'
epub_publisher = epub_author
epub_copyright = u'2011, Thomas S. Hatch'
epub_copyright = u'2012, Thomas S. Hatch'
epub_scheme = 'URL'
epub_identifier = 'http://saltstack.org/'