merge 6.2p1; reorder additions to monitor.h for easier merging in future

1 files changed, 2 insertions, 2 deletions

diff --git a/version.h b/version.h
index 76adaaff2..784f707a6 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
-/* $OpenBSD: version.h,v 1.65 2012/07/22 18:19:21 markus Exp $ */
+/* $OpenBSD: version.h,v 1.66 2013/02/10 21:19:34 markus Exp $ */
 
-#define SSH_VERSION     "OpenSSH_6.1"
+#define SSH_VERSION     "OpenSSH_6.2"
 
 #define SSH_PORTABLE    "p1"
 #define SSH_RELEASE     SSH_VERSION SSH_PORTABLE