Merge branch 'QA_4_6'
commit85b904cec4d0afc308fa241de42e1fab5845d757
authorDeven Bansod <devenbansod.bits@gmail.com>
Sun, 9 Oct 2016 19:51:50 +0000 (10 01:21 +0530)
committerDeven Bansod <devenbansod.bits@gmail.com>
Sun, 9 Oct 2016 19:51:50 +0000 (10 01:21 +0530)
tree305f9ee2b42d8e87d49a63ffb89db8d07a38a986
parentc9251735f3a8beab911440bc2df02af0bf4524e7
parentc455a5cf8f48b1ce351969d5d6204500fd7d482e
Merge branch 'QA_4_6'

Conflicts:
po/ar.po
po/ckb.po
po/ko.po