summaryrefslogtreecommitdiffstats
path: root/po/es.po
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-10-07 21:38:06 +0200
committerLennart Poettering <lennart@poettering.net>2008-10-07 21:38:06 +0200
commit5925d44013e2d559d1755176af0e26f69fc46458 (patch)
tree2724bf186d3a19008990c924b3c68ce976e92dcc /po/es.po
parent3d7b76d159765a78e6e7288bd7aa5c276aa24e87 (diff)
parent8c2a7c8707a556e4891383bc1786958304828dd9 (diff)
Merge commit 'origin/master-tx' into master-tx
Conflicts: po/de.po
Diffstat (limited to 'po/es.po')
0 files changed, 0 insertions, 0 deletions