aboutsummaryrefslogtreecommitdiffstats
path: root/po/mr.po
diff options
context:
space:
mode:
authorBryn M. Reeves <bmr@redhat.com>2013-04-16 15:37:53 +0100
committerBryn M. Reeves <bmr@redhat.com>2013-04-16 15:37:53 +0100
commitbe1ed81f37da62cb58229b4c947b90a817d73955 (patch)
treeb122451642a2d540ec692adff55cac01e91db0fc /po/mr.po
parentd7b6b629abf423ee2e0392e7ef18e6a595724417 (diff)
parent9a007ea08bae98bca28e691181b89b16fd68ee12 (diff)
downloadsos-be1ed81f37da62cb58229b4c947b90a817d73955.tar.gz
Merge branch 'shell-fix-debian-packaging'
Conflicts: sos/plugins/hardware.py
Diffstat (limited to 'po/mr.po')
0 files changed, 0 insertions, 0 deletions