diff options
author | Evan Prodromou <evan@status.net> | 2009-11-10 14:26:49 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-11-10 14:26:49 -0500 |
commit | 7ae10c27b0725a7108b63a788affd4d07e37afdc (patch) | |
tree | 92f952319071ba770136d3e69a82e51040ecb6b5 /lib/xmloutputter.php | |
parent | 8d5c2b3129a1d7cefd78e311d5cbbe9ab426bb72 (diff) | |
parent | 737fe763471bcb6ebd95c318363308a33e28e889 (diff) |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
lib/util.php
Diffstat (limited to 'lib/xmloutputter.php')
-rw-r--r-- | lib/xmloutputter.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/xmloutputter.php b/lib/xmloutputter.php index 9d862b2d0..5f06e491d 100644 --- a/lib/xmloutputter.php +++ b/lib/xmloutputter.php @@ -112,7 +112,7 @@ class XMLOutputter * * Utility for outputting an XML element. A convenient wrapper * for a bunch of longer XMLWriter calls. This is best for - * when an element does not have any sub-elements; if that's the + * when an element doesn't have any sub-elements; if that's the * case, use elementStart() and elementEnd() instead. * * The $content element will be escaped for XML. If you need |