Merge remote-tracking branch 'origin/master'
commit32d3b35df80f5df5fea48b25997df9f729c9d868
authorWeblate <noreply@weblate.org>
Wed, 4 Feb 2015 07:14:42 +0000 (4 08:14 +0100)
committerWeblate <noreply@weblate.org>
Wed, 4 Feb 2015 07:14:42 +0000 (4 08:14 +0100)
tree9435e02f8d88602ce17cc3a9868cfddb500bf9ef
parentafaf83cbb5ae3183ed1f496a9a5be92145f82080
parent08ba93f9ba11d7bf66d612f264b2d55eaf5021fd
Merge remote-tracking branch 'origin/master'