changeset 5057:ffe4df586561 stable-1.2

Merge of r5001: year 2013.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 11 Feb 2013 15:00:43 +0000
parents 63bc961253eb
children f25d0bbc4392
files docs/man/nginx.8 docs/text/LICENSE
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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