<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -203,6 +203,7 @@ end
 end
 
 
+
 # The following will make proxy methods to the ::File class if the file class has the 
 # proper method.  The various cases are for alternate formats of the paramaters.
 # If the method is not referenced in one of the formatting variables then the method will
@@ -261,4 +262,5 @@ end
       proxy(::File.new(path)).send(meth, *args)
     end
   end
-end
\ No newline at end of file
+end
+</diff>
      <filename>lib/adapters/fs/file.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>acbf211b53d1e5d90d60cc38a55250b927a1835f</id>
    </parent>
    <parent>
      <id>b37ba611f82c3f2c59e10016e258c9b07b802535</id>
    </parent>
  </parents>
  <author>
    <name>Joshaven Potter</name>
    <email>yourtech@gmail.com</email>
  </author>
  <url>http://github.com/joshaven/fsds/commit/5de5a26abf84103e666ee3e96548f6006c6295ef</url>
  <id>5de5a26abf84103e666ee3e96548f6006c6295ef</id>
  <committed-date>2009-11-06T08:31:17-08:00</committed-date>
  <authored-date>2009-11-06T08:31:17-08:00</authored-date>
  <message>Merge branch 'master' of github.com:joshaven/fsds

Conflicts:
	lib/adapters/fs/file.rb
	spec/fsds_fs_file_spec.rb</message>
  <tree>634a71a9c9ab71de64ca8069e0a77f29f10b58f7</tree>
  <committer>
    <name>Joshaven Potter</name>
    <email>yourtech@gmail.com</email>
  </committer>
</commit>
