summaryrefslogtreecommitdiff
path: root/po
diff options
authorcgregan@canonical.com <>2014-06-11 18:36:28 +0000
committerDaniel Manrique <>2014-06-11 18:36:28 +0000
commit57f08f6614e7c7bb0d25cf6aecc65309b1a114eb (patch)
treeefb33fd22298742e84afc77a4472eaabc11c98da /po
parentcd4af39175dfea58a7274826da666f1b7b3ebef7 (diff)
parent3e715ec8e60357bdb108670020f4f1ee90936511 (diff)
"automatic merge by tarmac [r=roadmr][bug=][author=cgregan]"
Diffstat (limited to 'po')
0 files changed, 0 insertions, 0 deletions