Fix merge conflict.
authorJan Schneider <jan@horde.org>
Thu, 9 Dec 2010 15:01:41 +0000 (16:01 +0100)
committerJan Schneider <jan@horde.org>
Thu, 9 Dec 2010 15:01:41 +0000 (16:01 +0100)
commit8269b0fb257f41b2ce4b4bd75de3df32f0739cc6
treef1758e649c6f400e2b37767c1b08dbbc0cbebba7
parentc2ac9b9b759c3cde20ac00959f3b78ad9b596ffb
Fix merge conflict.
jonah/stories/share.php