# HG changeset patch
# User Chris Cannam
# Date 1310637053 -3600
# Node ID 7eba09d624db771a77805f82b0d407c8bc0177e1
# Parent  b9aebdd7dd40e9199d4825a6ae008b826397fb2b# Parent  107d36338b70fa961bd32f62189a5aee56216f9b
Merge

diff -r 107d36338b70 -r 7eba09d624db README.rdoc
--- a/README.rdoc	Thu Jul 14 10:43:07 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 107d36338b70 -r 7eba09d624db files/delete.me
--- a/files/delete.me	Thu Jul 14 10:43:07 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 107d36338b70 -r 7eba09d624db log/delete.me
--- a/log/delete.me	Thu Jul 14 10:43:07 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