summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-04 10:16:59 -0800
committerBrion Vibber <brion@pobox.com>2010-03-04 10:16:59 -0800
commitf969d6349c244e2ec32c3ebe7eb355426006f4db (patch)
treeb66cd619681ffd868178ae3d4b8f6103adcc036e /locale
parentb218aee94e581230e1efa14d4ae1a19756986ddf (diff)
parentb720c7554be2a8e15c3772fe1071c48cf91935d6 (diff)
Merge branch 'testing' into 0.9.x
Conflicts: db/08to09.sql
Diffstat (limited to 'locale')
0 files changed, 0 insertions, 0 deletions