summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2009-02-16 21:03:09 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2009-02-16 21:03:09 +0000
commitfd28d04c39f83672f674aa2d83557db36a70b4b5 (patch)
treeb04f7bd38cb24ae4ed1a094fcb8a54f36806bdd6 /docs/ref
parent8ada8d7c0391572d0b1f0408394d041e59d19be4 (diff)
Merge branch 'master' into upstream-trunk
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
0 files changed, 0 insertions, 0 deletions