# HG changeset patch
# User Paul Crowley <paul@lshift.net>
# Date 1257787634 0
# Node ID eda519b53ab8daab4f3eb6aa940acd70e487d2f3
# Parent  345d2f3bbf90d0ef9fc2c56d9d57dcc40fde36d1# Parent  32cf12a724f8e45639be2fe8d7a40fd40a4a0894
Merge in changes from default

diff -r 345d2f3bbf90 -r eda519b53ab8 .hgtags
--- a/.hgtags	Mon Nov 09 17:16:11 2009 +0000
+++ b/.hgtags	Mon Nov 09 17:27:14 2009 +0000
@@ -1,2 +1,3 @@
 535502c18eaad098437e49adea1e26a68e4b6d75 release_0.5
 975fb921c3f3ffe7ccde5877f2954a5d1141bb14 release_0.6
+243dd21d0dbc140957afbe7c9e2afb9caaffee37 release_0.7
diff -r 345d2f3bbf90 -r eda519b53ab8 doc/manual.docbook
--- a/doc/manual.docbook	Mon Nov 09 17:16:11 2009 +0000
+++ b/doc/manual.docbook	Mon Nov 09 17:27:14 2009 +0000
@@ -52,12 +52,12 @@
 <screen><computeroutput>jay@spoon:~$ </computeroutput><userinput>scp mercurial-server_0.6.1_amd64.deb jeeves:</userinput>
 <computeroutput>mercurial-server_0.6.1_amd64.deb 100%
 jay@spoon:~$ </computeroutput><userinput>ssh -A jeeves</userinput>
-<computeroutput>jay@jeeves:~$ </computeroutput><userinput>sudo dpkg -i mercurial-server_0.6.1_amd64.deb</userinput>
+<computeroutput>jay@jeeves:~$ </computeroutput><userinput>sudo dpkg -i mercurial-server_0.7_amd64.deb</userinput>
 <computeroutput>[sudo] password for jay: 
 Selecting previously deselected package mercurial-server.
 (Reading database ... 144805 files and directories currently installed.)
-Unpacking mercurial-server (from .../mercurial-server_0.6.1_amd64.deb) ...
-Setting up mercurial-server (0.6.1) ...
+Unpacking mercurial-server (from .../mercurial-server_0.7_amd64.deb) ...
+Setting up mercurial-server (0.7) ...
 jay@jeeves:~$ </computeroutput></screen>
 <para>
 mercurial-server is now installed on the repository host.  Next, we need to give you permission to access its repositories.
diff -r 345d2f3bbf90 -r eda519b53ab8 setup.py
--- a/setup.py	Mon Nov 09 17:16:11 2009 +0000
+++ b/setup.py	Mon Nov 09 17:27:14 2009 +0000
@@ -7,7 +7,7 @@
     name="mercurial-server",
     description="Centralized Mercurial repository manager",
     url="http://www.lshift.net/mercurial-server.html",
-    version="0.6+", # FIXME: infer this
+    version="0.7", # FIXME: infer this
     package_dir = {'': 'src'},
     packages = ["mercurialserver"],
     requires = ["mercurial"], # FIXME: what version?