summaryrefslogtreecommitdiff
path: root/program/localization/mr_IN
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-11-15 09:34:08 +0100
committerAleksander Machniak <alec@alec.pl>2012-11-15 09:34:08 +0100
commit8d54286df87e21673c05f091e38ca4de14aae326 (patch)
treed60c6d6765f5beafe4966352ebbd52e4c9c9661b /program/localization/mr_IN
parent82d875769cade12b82aeab6723c869d87fb7a4c9 (diff)
parentf226549d4f8f258deca9e165ef857252b79d2ee0 (diff)
Merge branch 'keep-alive'
Conflicts: CHANGELOG
Diffstat (limited to 'program/localization/mr_IN')
0 files changed, 0 insertions, 0 deletions