summaryrefslogtreecommitdiff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorAndrew Victor <andrew.victor@mxit.com>2013-03-06 23:15:58 +0200
committerAndrew Victor <andrew.victor@mxit.com>2013-03-06 23:15:58 +0200
commitca459726f83e96ef4e99938d82c87a1934326391 (patch)
tree4b8728cafa31b7775e13e32880ebc000adf86cdb /COPYRIGHT
parent2e218477ba4ce3fb31c78188fa0c7a41a043d4d1 (diff)
downloadpidgin-ca459726f83e96ef4e99938d82c87a1934326391.tar.gz
Fix merge error from release-2.x.y.
Diffstat (limited to 'COPYRIGHT')
0 files changed, 0 insertions, 0 deletions