# HG changeset patch
# User raph
# Date 1268297889 -3600
# Node ID 912b4331a1ee7ced9905e492e290481da64ef26d
# Parent  d23beba39833ef7579d6bf4f25612d83cbb091b9# Parent  4b5aaa0c8545b1a4e51eae3b900df0e4eb473a8a
Merge with 4b5aaa0c8545b1a4e51eae3b900df0e4eb473a8a

diff -r 4b5aaa0c8545 -r 912b4331a1ee README.txt
--- a/README.txt	Wed Mar 10 22:11:12 2010 +0100
+++ b/README.txt	Thu Mar 11 09:58:09 2010 +0100
@@ -46,7 +46,7 @@
 2. Install pandoc
 	(ubuntu users : 'sudo apt-get install pandoc')
 3. Install openoffice (headless mode) [used for document conversion]
-	(ubuntu users : 'sudo apt-get install sun-java6-jre openoffice.org openoffice.org-headless xvfb)
+	(ubuntu users : 'sudo apt-get install sun-java6-jre openoffice.org openoffice.org-headless xvfb')
 4. Install/configure database [skip this step if you plan to use a sqlite database]
 	4 a) Postgresql
 		- Install and configure database server [skip this step if use an external database server] 
diff -r 4b5aaa0c8545 -r 912b4331a1ee src/cm/media/js/client/f_client-min.js