diff config/.svn/all-wcprops @ 514:7eba09d624db live

Merge

--- a/config/.svn/all-wcprops	Thu Jul 14 10:46:20 2011 +0100
+++ b/config/.svn/all-wcprops	Thu Jul 14 10:50:53 2011 +0100
@@ -1,47 +1,17 @@
 K 25
 svn:wc:ra_dav:version-url
-V 31
-/svn/!svn/ver/4405/trunk/config
-END
-settings.yml
-K 25
-svn:wc:ra_dav:version-url
-V 44
-/svn/!svn/ver/4362/trunk/config/settings.yml
-END
-email.yml.example
-K 25
-svn:wc:ra_dav:version-url
-V 49
-/svn/!svn/ver/3448/trunk/config/email.yml.example
+V 45
+/svn/!svn/ver/6161/branches/1.2-stable/config
 END
 routes.rb
 K 25
 svn:wc:ra_dav:version-url
-V 41
-/svn/!svn/ver/4372/trunk/config/routes.rb
-END
-boot.rb
-K 25
-svn:wc:ra_dav:version-url
-V 39
-/svn/!svn/ver/2887/trunk/config/boot.rb
+V 55
+/svn/!svn/ver/5878/branches/1.2-stable/config/routes.rb
 END
 environment.rb
 K 25
 svn:wc:ra_dav:version-url
-V 46
-/svn/!svn/ver/3372/trunk/config/environment.rb
+V 60
+/svn/!svn/ver/5878/branches/1.2-stable/config/environment.rb
 END
-additional_environment.rb.example
-K 25
-svn:wc:ra_dav:version-url
-V 65
-/svn/!svn/ver/3018/trunk/config/additional_environment.rb.example
-END
-database.yml.example
-K 25
-svn:wc:ra_dav:version-url
-V 52
-/svn/!svn/ver/3564/trunk/config/database.yml.example
-END