summaryrefslogtreecommitdiff
path: root/local
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-01-06 16:24:25 -0800
committerZach Copley <zach@status.net>2010-01-06 16:24:25 -0800
commit5d13126c88a8143a1628cc52c2dae4581f134273 (patch)
tree8a0add7ba172f63b180b1f6d57a74f26ea9a1801 /local
parenta1c3a2d3a12c1667492e4107007b31ec3a1f9c7b (diff)
parent5d9a2eb17e3f6e3bc73b5aa80625a365761b6689 (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