summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-02-12 18:58:29 +0000
committerBrion Vibber <brion@pobox.com>2010-02-12 18:58:29 +0000
commit22025e3b7b5ddfd26162a59b697690f50775c79c (patch)
tree672187a4803b899f1e4d2d709a8f820b938d00d6 /lib
parentb39047d95b447251de75d15b986017286aca05e0 (diff)
parent47f6b0afc9a94b5e649102dd209950b94c6ac33a (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions