diff options
| author | Brion Vibber <brion@pobox.com> | 2010-05-05 17:07:50 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-05-05 17:07:50 -0700 |
| commit | e05415f621890bbaf42752577249ecdc22c161fc (patch) | |
| tree | 9291f0eb1b6c0a57ffeaa7279d4316ab6041206d /scripts/getvaliddaemons.php | |
| parent | 94190e77f664c06c76e650fdebd23720fe26bf6e (diff) | |
| parent | b50f300566143837aba3739d62caf679ec19727e (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
locale/ca/LC_MESSAGES/statusnet.po
locale/de/LC_MESSAGES/statusnet.po
locale/statusnet.pot
Diffstat (limited to 'scripts/getvaliddaemons.php')
0 files changed, 0 insertions, 0 deletions