From: Maxim Dounin <mdounin@mdounin.ru>
Date: Mon, 11 Feb 2013 15:00:43 +0000 (+0000)
Subject: Merge of r5001: year 2013.
X-Git-Tag: release-1.2.7~9
X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=7ce291435a0930cc6671e58f5abb530ae8255c76;p=nginx.git

Merge of r5001: year 2013.
---

diff --git a/docs/man/nginx.8 b/docs/man/nginx.8
index 8fcb0b0d2..f119a2327 100644
--- a/docs/man/nginx.8
+++ b/docs/man/nginx.8
@@ -1,6 +1,6 @@
 .\"
-.\" Copyright (c) 2010 Sergey A. Osokin
-.\" Copyright (c) 2011,2012 Nginx, Inc.
+.\" Copyright (C) 2010 Sergey A. Osokin
+.\" Copyright (C) Nginx, Inc.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/docs/text/LICENSE b/docs/text/LICENSE
index c78be7e37..5d8097000 100644
--- a/docs/text/LICENSE
+++ b/docs/text/LICENSE
@@ -1,6 +1,6 @@
 /* 
- * Copyright (C) 2002-2012 Igor Sysoev
- * Copyright (C) 2011,2012 Nginx, Inc.
+ * Copyright (C) 2002-2013 Igor Sysoev
+ * Copyright (C) 2011-2013 Nginx, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without