Junio C Hamano 5e950c2199 Merge branch 'maint-1.8.1' into maint ...

* maint-1.8.1:
  git help config: s/insn/instruction/

2013-03-28 14:34:07 -07:00

..

howto

Merge branch 'ta/doc-no-small-caps'

2013-02-05 16:13:32 -08:00

RelNotes

More fixes for 1.8.2.1

2013-03-27 10:57:57 -07:00

technical

Merge branch 'maint-1.8.1' into maint

2013-03-25 13:46:42 -07:00

.gitattributes

…

.gitignore

doc: generate a list of valid merge tools

2013-02-02 21:46:52 -08:00

asciidoc.conf

Documentation: avoid poor-man's small caps GIT

2013-02-01 13:53:25 -08:00

blame-options.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

build-docdep.perl

…

cat-texi.perl

…

cmd-list.perl

…

CodingGuidelines

Merge branch 'tz/perl-styles'

2013-02-14 10:28:55 -08:00

config.txt

Merge branch 'maint-1.8.1' into maint

2013-03-28 14:34:07 -07:00

date-formats.txt

…

diff-config.txt

Merge branch 'mp/diff-algo-config'

2013-02-17 15:25:52 -08:00

diff-format.txt

…

diff-generate-patch.txt

docs: stop using asciidoc no-inline-literal

2012-04-26 13:19:06 -07:00

diff-options.txt

Merge branch 'maint-1.8.1' into maint

2013-03-25 13:46:42 -07:00

docbook-xsl.css

…

docbook.xsl

Documentation: set a !DOCTYPE for user manual

2010-08-20 10:53:56 -07:00

everyday.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

fetch-options.txt

fetch: elaborate --depth action

2013-01-11 09:11:10 -08:00

fix-texi.perl

…

git-add.txt

add: Clarify documentation of -A and -u

2013-03-07 11:16:54 -08:00

git-am.txt

Merge branch 'jb/am-include'

2012-04-20 15:49:16 -07:00

git-annotate.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-apply.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-archimport.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-archive.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-bisect-lk2009.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-bisect.txt

Merge branch 'mg/bisect-doc'

2013-02-14 10:29:01 -08:00

git-blame.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-branch.txt

Merge branch 'nd/branch-error-cases'

2013-02-07 14:41:38 -08:00

git-bundle.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-cat-file.txt

doc: drop author/documentation sections from most pages

2011-03-11 10:59:16 -05:00

git-check-attr.txt

Teach '--cached' option to check-attr

2011-09-22 16:38:22 -07:00

git-check-ignore.txt

add git-check-ignore sub-command

2013-01-06 14:26:38 -08:00

git-check-ref-format.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-checkout-index.txt

doc: drop author/documentation sections from most pages

2011-03-11 10:59:16 -05:00

git-checkout.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-cherry-pick.txt

Merge branch 'cw/cherry-pick-allow-empty-message'

2012-09-03 15:53:37 -07:00

git-cherry.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-citool.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-clean.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-clone.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-column.txt

Documentation: spelling fixes

2012-06-19 11:35:19 -07:00

git-commit-tree.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-commit.txt

Merge branch 'maint-1.8.1' into maint

2013-03-27 10:51:10 -07:00

git-config.txt

Merge branch 'jn/warn-on-inaccessible-loosen' into maint

2013-01-11 16:47:07 -08:00

git-count-objects.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-credential-cache--daemon.txt

command-list: mention git-credential-* helpers

2012-08-08 12:11:54 -07:00

git-credential-cache.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-credential-store.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-credential.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-cvsexportcommit.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-cvsimport.txt

Merge branch 'ta/doc-no-small-caps'

2013-02-05 16:13:32 -08:00

git-cvsserver.txt

Merge branch 'ta/doc-no-small-caps'

2013-02-05 16:13:32 -08:00

git-daemon.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-describe.txt

Merge branch 'maint-1.8.1' into maint

2013-03-25 13:46:42 -07:00

git-diff-files.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-diff-index.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-diff-tree.txt

docs: fix some antique example output

2011-05-26 22:15:39 -07:00

git-diff.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-difftool.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-fast-export.txt

docs: stop using asciidoc no-inline-literal

2012-04-26 13:19:06 -07:00

git-fast-import.txt

Merge branch 'jk/maint-fast-import-doc-reorder' into maint

2013-01-14 07:59:46 -08:00

git-fetch-pack.txt

fetch: add --unshallow for turning shallow repo into complete one

2013-01-11 09:09:30 -08:00

git-fetch.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-filter-branch.txt

Merge branch 'maint-1.8.1' into maint

2013-03-25 13:46:42 -07:00

git-fmt-merge-msg.txt

Document merge.branchdesc configuration variable

2012-02-23 11:20:15 -08:00

git-for-each-ref.txt

git-for-each-ref.txt: 'raw' is a supported date format

2013-01-21 16:26:26 -08:00

git-format-patch.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-fsck-objects.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-fsck.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-gc.txt

docs: stop using asciidoc no-inline-literal

2012-04-26 13:19:06 -07:00

git-get-tar-commit-id.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-grep.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-gui.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-hash-object.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-help.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-http-backend.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-http-fetch.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-http-push.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-imap-send.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-index-pack.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-init-db.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-init.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-instaweb.txt

Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages

2011-10-16 11:09:35 -07:00

git-log.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-lost-found.txt

Documentation: do not mention .git/refs/* directories

2012-08-06 14:04:16 -07:00

git-ls-files.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-ls-remote.txt

ls-remote: document the '--get-url' option

2012-09-07 10:58:35 -07:00

git-ls-tree.txt

doc: drop author/documentation sections from most pages

2011-03-11 10:59:16 -05:00

git-mailinfo.txt

Merge branch 'tr/maint-mailinfo'

2012-01-12 23:34:26 -08:00

git-mailsplit.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-merge-base.txt

merge-base: "--is-ancestor A B"

2012-08-31 11:45:33 -07:00

git-merge-file.txt

docs: put listed example commands in backticks

2011-08-04 15:49:13 -07:00

git-merge-index.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-merge-one-file.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-merge-tree.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-merge.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-mergetool--lib.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-mergetool.txt

Merge branch 'da/difftool-updates'

2012-08-27 11:55:17 -07:00

git-mktag.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-mktree.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-mv.txt

Documentation: avoid poor-man's small caps GIT

2013-02-01 13:53:25 -08:00

git-name-rev.txt

doc: drop author/documentation sections from most pages

2011-03-11 10:59:16 -05:00

git-notes.txt

Doc notes: Include the format-patch --notes option

2012-10-25 06:15:56 -04:00

git-p4.txt

Merge branch 'ta/doc-no-small-caps'

2013-02-05 16:13:32 -08:00

git-pack-objects.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-pack-redundant.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-pack-refs.txt

Merge branch 'jc/tag-doc' into maint-1.7.11

2012-08-24 12:05:30 -07:00

git-parse-remote.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-patch-id.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-peek-remote.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-prune-packed.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-prune.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-pull.txt

Merge branch 'maint-1.8.1' into maint

2013-03-27 10:51:10 -07:00

git-push.txt

Merge branch 'jc/maint-push-refspec-default-doc' into maint

2013-03-26 12:40:14 -07:00

git-quiltimport.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-read-tree.txt

Merge branch 'jh/fetch-head-update'

2012-01-06 12:44:01 -08:00

git-rebase.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-receive-pack.txt

Sync with 1.7.6.2

2011-09-06 11:42:12 -07:00

git-reflog.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-relink.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-remote-ext.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-remote-fd.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-remote-helpers.txto

Rename {git- => git}remote-helpers.txt

2013-02-01 14:12:34 -08:00

git-remote-testgit.txt

Merge branch 'jk/remote-helpers-doc'

2013-02-07 14:41:45 -08:00

git-remote.txt

remote: prefer subcommand name 'remove' to 'rm'

2012-09-06 13:23:22 -07:00

git-repack.txt

fsck: --no-dangling omits "dangling object" information

2012-02-28 14:55:39 -08:00

git-replace.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-repo-config.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-request-pull.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-rerere.txt

docs: stop using asciidoc no-inline-literal

2012-04-26 13:19:06 -07:00

git-reset.txt

reset: update documentation to require only tree-ish with paths

2013-01-16 12:50:23 -08:00

git-rev-list.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-rev-parse.txt

Documentation: do not use undefined terms git-dir and git-file

2013-02-01 13:53:33 -08:00

git-revert.txt

docs: stop using asciidoc no-inline-literal

2012-04-26 13:19:06 -07:00

git-rm.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-send-email.txt

Documentation: avoid poor-man's small caps GIT

2013-02-01 13:53:25 -08:00

git-send-pack.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-sh-i18n--envsubst.txt

correct a few doubled-word nits in comments and documentation

2012-03-28 11:18:35 -07:00

git-sh-i18n.txt

Merge branch 'jn/doc-dashdash' into maint

2011-09-11 21:52:18 -07:00

git-sh-setup.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-shell.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-shortlog.txt

Merge branch 'jk/shortlog-no-wrap-doc' into maint

2013-01-14 07:59:03 -08:00

git-show-branch.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-show-index.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-show-ref.txt

docs: stop using asciidoc no-inline-literal

2012-04-26 13:19:06 -07:00

git-show.txt

docs: stop using asciidoc no-inline-literal

2012-04-26 13:19:06 -07:00

git-stage.txt

doc: add missing git footers

2011-03-11 10:59:16 -05:00

git-stash.txt

Documentation/git-stash.txt: add a missing verb

2012-12-10 08:18:25 -08:00

git-status.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-stripspace.txt

Merge branch 'ta/doc-no-small-caps'

2013-02-05 16:13:32 -08:00

git-submodule.txt

Merge branch 'maint'

2013-02-27 10:10:28 -08:00

git-svn.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-symbolic-ref.txt

git symbolic-ref --delete $symref

2012-10-21 12:17:38 -07:00

git-tag.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-tar-tree.txt

docs: stop using asciidoc no-inline-literal

2012-04-26 13:19:06 -07:00

git-tools.txt

Documentation: StGit is the right spelling, not StGIT

2013-02-01 13:54:46 -08:00

git-unpack-file.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-unpack-objects.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-update-index.txt

Merge branch 'maint-1.8.1' into maint

2013-03-25 13:46:42 -07:00

git-update-ref.txt

Documentation: avoid poor-man's small caps GIT

2013-02-01 13:53:25 -08:00

git-update-server-info.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git-upload-archive.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-upload-pack.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-var.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-verify-pack.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-verify-tag.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-web--browse.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-whatchanged.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

git-write-tree.txt

Documentation: use [verse] for SYNOPSIS sections

2011-07-06 14:26:26 -07:00

git.txt

Merge branch 'maint-1.8.1' into maint

2013-03-26 13:14:11 -07:00

gitattributes.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

gitcli.txt

Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maint

2013-03-26 12:40:04 -07:00

gitcore-tutorial.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

gitcredentials.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

gitcvs-migration.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

gitdiffcore.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

gitglossary.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

githooks.txt

Merge branch 'maint-1.8.1' into maint

2013-03-25 13:46:42 -07:00

gitignore.txt

Merge branch 'ta/doc-no-small-caps'

2013-02-05 16:13:32 -08:00

gitk.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

gitmodules.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

gitnamespaces.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

gitremote-helpers.txt

Merge branch 'jk/remote-helpers-doc'

2013-02-07 14:41:45 -08:00

gitrepository-layout.txt

Documentation: describe the "repository" in repository-layout

2013-02-01 13:54:46 -08:00

gitrevisions.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

gittutorial-2.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

gittutorial.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

gitweb.conf.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

gitweb.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

gitworkflows.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

glossary-content.txt

Documentation: add a description for 'gitfile' to glossary

2013-02-01 13:53:33 -08:00

howto-index.sh

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

i18n.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

install-doc-quick.sh

docs: Update install-doc-quick

2011-11-08 13:37:10 -08:00

install-webdoc.sh

install-webdoc: keep installed RelNotes-*.txt

2010-09-09 16:17:59 -07:00

mailmap.txt

Merge branch 'jk/mailmap-from-blob'

2013-01-05 23:41:42 -08:00

Makefile

Merge branch 'da/mergetool-docs'

2013-02-07 14:42:16 -08:00

manpage-1.72.xsl

…

manpage-base-url.xsl.in

…

manpage-base.xsl

…

manpage-bold-literal.xsl

…

manpage-normal.xsl

…

manpage-quote-apos.xsl

…

manpage-suppress-sp.xsl

…

merge-config.txt

Merge branch 'da/mergetool-docs'

2013-02-07 14:42:16 -08:00

merge-options.txt

merge: backport GIT_MERGE_AUTOEDIT support

2012-03-20 15:39:10 -07:00

merge-strategies.txt

merge: teach -Xours/-Xtheirs to binary ll-merge driver

2012-09-08 21:27:19 -07:00

pretty-formats.txt

log --format: teach %C(auto,black) to respect color config

2012-12-17 17:30:04 -08:00

pretty-options.txt

Documentation: Document signature showing options

2012-09-20 10:28:51 -07:00

pull-fetch-param.txt

docs: stop using asciidoc no-inline-literal

2012-04-26 13:19:06 -07:00

rev-list-options.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

revisions.txt

Merge branch 'maint'

2013-03-17 00:11:11 -07:00

sequencer.txt

revert: introduce --abort to cancel a failed cherry-pick

2011-11-22 18:16:59 -08:00

SubmittingPatches

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

urls-remotes.txt

Documentation: the name of the system is 'Git', not 'git'

2013-02-01 13:53:33 -08:00

urls.txt

Merge branch 'jk/remote-helpers-doc'

2013-02-07 14:41:45 -08:00

user-manual.conf

docs: monospace listings in docbook output

2012-08-07 14:30:52 -07:00

user-manual.txt

Merge branch 'wk/user-manual' into maint

2013-03-01 10:37:40 -08:00