summaryrefslogtreecommitdiff
path: root/local
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2009-11-02 10:16:06 -0800
committerBrion Vibber <brion@pobox.com>2009-11-02 10:16:06 -0800
commit86560eeb3db60f39b0e1f3ef011819e5f3172101 (patch)
tree7b4ec8fb83d3c9d513fe20c5ef7d796ff8301260 /local
parent1cf67f4f714be45cf93302f223a58c65402e3038 (diff)
parent58b9ce5946c5fea9b6f1a9f1c0c9641c5104d769 (diff)
Merge commit 'refs/merge-requests/1900' of git://gitorious.org/statusnet/mainline into integration
Diffstat (limited to 'local')
0 files changed, 0 insertions, 0 deletions