Author: mdounin
Date: 2013-02-11 15:00:43 +0000 (Mon, 11 Feb 2013)
New Revision: 5058
URL: http://trac.nginx.org/nginx/changeset/5058/nginx

Log:
Merge of r5001: year 2013.


Modified:
branches/stable-1.2/
branches/stable-1.2/docs/man/nginx.8
branches/stable-1.2/docs/text/LICENSE

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2 2013-02-11 14:58:25 UTC (rev 5057)
+++ branches/stable-1.2 2013-02-11 15:00:43 UTC (rev 5058)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4949,4961-4969,4973-4974,4976-4994,4997,4999-5000,5002-5003,5011
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4949,4961-4969,4973-4974,4976-4994,4997,4999-5003,5011
\ No newline at end of property
Modified: branches/stable-1.2/docs/man/nginx.8
===================================================================
--- branches/stable-1.2/docs/man/nginx.8 2013-02-11 14:58:25 UTC (rev 5057)
+++ branches/stable-1.2/docs/man/nginx.8 2013-02-11 15:00:43 UTC (rev 5058)
@@ -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

Modified: branches/stable-1.2/docs/text/LICENSE
===================================================================
--- branches/stable-1.2/docs/text/LICENSE 2013-02-11 14:58:25 UTC (rev 5057)
+++ branches/stable-1.2/docs/text/LICENSE 2013-02-11 15:00:43 UTC (rev 5058)
@@ -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

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel