# HG changeset patch
# User Chris Cannam
# Date 1310637090 -3600
# Node ID d745461ca8b6bcdd1709898c0e12d37db4ec4ff9
# Parent  c3c01edd24bb5b8b8734e6015a430c2f600a726d# Parent  7eba09d624db771a77805f82b0d407c8bc0177e1
Merge from branch "live"

diff -r c3c01edd24bb -r d745461ca8b6 README.rdoc
--- a/README.rdoc	Thu Jul 14 10:44:50 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-= Redmine
-
-Redmine is a flexible project management web application written using Ruby on Rails framework.
-
-More details can be found at in the doc directory or on the official website http://www.redmine.org
diff -r c3c01edd24bb -r d745461ca8b6 files/delete.me
--- a/files/delete.me	Thu Jul 14 10:44:50 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-default directory for uploaded files
\ No newline at end of file
diff -r c3c01edd24bb -r d745461ca8b6 log/delete.me
--- a/log/delete.me	Thu Jul 14 10:44:50 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-default directory for uploaded files
\ No newline at end of file