Merge remote-tracking branch 'origin/master'
commit1dc0dda8927ebad94c2a73a3059c4dd52962a6c9
authorWeblate <noreply@weblate.org>
Thu, 22 Jan 2015 15:55:08 +0000 (22 16:55 +0100)
committerWeblate <noreply@weblate.org>
Thu, 22 Jan 2015 15:55:08 +0000 (22 16:55 +0100)
treeb551fa9095d151869c7637b3ae5eeb78a9b86638
parent522c4cef0fa0424e6ab0a705cea9547716c3318b
parent1bcf053c6759026acbd77a4df03631e4872d0dc3
Merge remote-tracking branch 'origin/master'