summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2010-03-02 15:26:27 -0500
committerSarven Capadisli <csarven@status.net>2010-03-02 15:26:27 -0500
commite9c127ddd869f44eafe7ae6b30d9dc69df8b863c (patch)
treea5847af8504385223110b579c9dab702cd766afa /COPYING
parent4113f28851020509163a31ab20658429d86c3134 (diff)
parent72460091ddc6763cb8d62f9d865390ea4973dd44 (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions