fixed failed merge with autogen.sh

9 files changed, 9 insertions, 9 deletions

diff --git a/man/man7/zmq.7 b/man/man7/zmq.7
index 584c9ce..740726c 100644
--- a/man/man7/zmq.7
+++ b/man/man7/zmq.7
@@ -1,4 +1,4 @@
-.TH zmq 7 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals"
+.TH zmq 7 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals"
 .SH NAME
 0MQ \- a lightweight messaging kernel
 .SH SYNOPSIS
diff --git a/man/man7/zmq_cl.7 b/man/man7/zmq_cl.7
index b9dd14f..c4f0162 100644
--- a/man/man7/zmq_cl.7
+++ b/man/man7/zmq_cl.7
@@ -1,4 +1,4 @@
-.TH zmq_cl 7 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals"
+.TH zmq_cl 7 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals"
 .SH NAME
 Common Lisp API for 0MQ lightweight messaging kernel
 .SH SYNOPSIS
diff --git a/man/man7/zmq_cpp.7 b/man/man7/zmq_cpp.7
index bcadab9..4df9157 100644
--- a/man/man7/zmq_cpp.7
+++ b/man/man7/zmq_cpp.7
@@ -1,4 +1,4 @@
-.TH zmq_cpp 7 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals"
+.TH zmq_cpp 7 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals"
 .SH NAME
 C++ API for 0MQ lightweight messaging kernel
 .SH SYNOPSIS
diff --git a/man/man7/zmq_inproc.7 b/man/man7/zmq_inproc.7
index 63779d9..7f43ca7 100644
--- a/man/man7/zmq_inproc.7
+++ b/man/man7/zmq_inproc.7
@@ -1,4 +1,4 @@
-.TH zmq_inproc 7 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals"
+.TH zmq_inproc 7 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals"
 .SH NAME
 In-process (inter-thread) tranport for 0MQ
 .SH SYNOPSIS
diff --git a/man/man7/zmq_pgm.7 b/man/man7/zmq_pgm.7
index 1b46a6b..57af65e 100644
--- a/man/man7/zmq_pgm.7
+++ b/man/man7/zmq_pgm.7
@@ -1,4 +1,4 @@
-.TH zmq_pgm 7 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals"
+.TH zmq_pgm 7 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals"
 .SH NAME
 PGM-based tranport for 0MQ
 .SH SYNOPSIS
diff --git a/man/man7/zmq_python.7 b/man/man7/zmq_python.7
index 14f3697..ee339f9 100644
--- a/man/man7/zmq_python.7
+++ b/man/man7/zmq_python.7
@@ -1,4 +1,4 @@
-.TH zmq_python 7 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals"
+.TH zmq_python 7 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals"
 .SH NAME
 Python API for 0MQ lightweight messaging kernel
 .SH SYNOPSIS
diff --git a/man/man7/zmq_ruby.7 b/man/man7/zmq_ruby.7
index 8c7bde3..e54a304 100644
--- a/man/man7/zmq_ruby.7
+++ b/man/man7/zmq_ruby.7
@@ -1,4 +1,4 @@
-.TH zmq_ruby 7 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals"
+.TH zmq_ruby 7 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals"
 .SH NAME
 Ruby API for 0MQ lightweight messaging kernel
 .SH SYNOPSIS
diff --git a/man/man7/zmq_tcp.7 b/man/man7/zmq_tcp.7
index 5bb867e..0b9a596 100644
--- a/man/man7/zmq_tcp.7
+++ b/man/man7/zmq_tcp.7
@@ -1,4 +1,4 @@
-.TH zmq_tcp 7 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals"
+.TH zmq_tcp 7 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals"
 .SH NAME
 TCP-based tranport for 0MQ
 .SH SYNOPSIS
diff --git a/man/man7/zmq_udp.7 b/man/man7/zmq_udp.7
index a6ce447..16cbf08 100644
--- a/man/man7/zmq_udp.7
+++ b/man/man7/zmq_udp.7
@@ -1,4 +1,4 @@
-.TH zmq_udp 7 "" "(c)2007-2009 FastMQ Inc." "0MQ User Manuals"
+.TH zmq_udp 7 "" "(c)2007-2010 iMatix Corporation" "0MQ User Manuals"
 .SH NAME
 UDP-based tranport for 0MQ
 .SH SYNOPSIS