summaryrefslogtreecommitdiff
path: root/local
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2009-12-02 22:18:55 +0000
committerZach Copley <zach@status.net>2009-12-02 22:18:55 +0000
commit39f3e69bb5c7165bbdbe4bbefb3ec6b4bd19c141 (patch)
tree6408c61d852e4c8b76ee59d1c3e41c3939005d8e /local
parent02bbebcd65b5833f4c4d2ca2ac26c5b5ffe04988 (diff)
parentd3189763422a87f9f977646ad57e7d4a2ea29026 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'local')
0 files changed, 0 insertions, 0 deletions