Browse files

Merge remote branch 'upstream/master'

Conflicts:
	README.markdown
  • Loading branch information...
2 parents 356269e + f412f99 commit 9f6205c7af3e8ea35041efd8e1f17454c7406ee7 @jwage jwage committed Apr 20, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 README.markdown
View
2 README.markdown
@@ -107,4 +107,4 @@ like the following:
<user>
<id>1</id>
<username>jwage</username>
- </user>
+ </user>

0 comments on commit 9f6205c

Please sign in to comment.