summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-05-19 12:51:25 -0700
committerBrion Vibber <brion@pobox.com>2010-05-19 12:51:25 -0700
commit7005ef66617b265ddccdd9082c2368bf014a7e83 (patch)
tree52f853c4d47063f0af488a7ff5fb52df50b430bb /db
parent48dc899acb9a0ac87140353092dab1f5e67753d8 (diff)
parenta39a934dd4a133bad6e76fa9a5018cedcb70225c (diff)
Merge branch 'testing' into 0.9.x
Conflicts: plugins/OpenID/openidlogin.php
Diffstat (limited to 'db')
0 files changed, 0 insertions, 0 deletions