summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2010-07-15 21:22:24 +0200
committervarac <varacanero@zeromail.org>2010-07-15 21:22:24 +0200
commit5952611119d839eea1e4b39be1c89fa2e5cae502 (patch)
tree16073fcffb5553bd723ff849d50ac33082c4a6ac /README
parent99b7fc4a95b10fb7844c3f3da1254b011986b5cc (diff)
fixed unclomplete merge with riseups master
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions