Merge remote-tracking branch 'origin/master'
commite6c8a6faf516bf4248b135331c010c58e43204bb
authorWeblate <noreply@weblate.org>
Thu, 6 Aug 2015 10:47:26 +0000 (6 12:47 +0200)
committerWeblate <noreply@weblate.org>
Thu, 6 Aug 2015 10:47:26 +0000 (6 12:47 +0200)
tree3805c46f4349982fe2737074b50d756d4d7d7fbf
parent79e92cbeb8bb7a805e4d0a6ab8c2568840e34f2c
parentbb1646dec757f40a4dabae2dec48bd1bcbb58260
Merge remote-tracking branch 'origin/master'