Merge remote-tracking branch 'origin/master'
commitfb4cd93fdef953919e3c48a9263c545969188e38
authorWeblate <noreply@weblate.org>
Sun, 4 Jan 2015 12:14:05 +0000 (4 13:14 +0100)
committerWeblate <noreply@weblate.org>
Sun, 4 Jan 2015 12:14:05 +0000 (4 13:14 +0100)
treede3b9a49c30ec87049fe699079497cdadd3f3e1a
parenta331e33bc8c4d7fe6402632590b50a149df298d5
parent1ca21634a814719bc739a2d93579189e2356f235
Merge remote-tracking branch 'origin/master'