Merge branch 'master' into develop

twilio · Jul 19, 2011 · de4275d · de4275d
2 parents ad81392 + 244b69e
commit de4275d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/README → README.md b/README → README.md
diff --git a/package.xml b/package.xml
@@ -79,7 +79,7 @@ No release notes.
    </dir> <!-- /tests -->
    <file name="LICENSE" role="data" />
    <file name="Makefile" role="data" />
-   <file name="README" role="data" />
+   <file name="README.md" role="data" />
   </dir> <!-- / -->
  </contents>
  <dependencies>