summaryrefslogtreecommitdiff
path: root/extlib
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-06-16 12:38:35 -0700
committerBrion Vibber <brion@pobox.com>2010-06-16 12:38:35 -0700
commit9684cbe3c6d61be0b1cc2094bc4278cd8a21b33e (patch)
tree46a52783103529ccd52b4a5af5347df35cf9f894 /extlib
parent7f3b3620af2af88ced37da1d9f8913cfd1a31b90 (diff)
parentd65d9826811c5e9b2aec01aa89abffbfbee535f8 (diff)
Merge branch 'testing' into 0.9.x
Conflicts: plugins/OpenID/openidserver.php
Diffstat (limited to 'extlib')
0 files changed, 0 insertions, 0 deletions