Merge remote-tracking branch 'origin/master'
commit35868af3af243a95fd8fe42f671fa0711e3df14e
authorWeblate <noreply@weblate.org>
Fri, 23 Jan 2015 10:17:50 +0000 (23 11:17 +0100)
committerWeblate <noreply@weblate.org>
Fri, 23 Jan 2015 10:17:50 +0000 (23 11:17 +0100)
treec58b4e7db9baeb23a809b5f750e4cfe7639b07fd
parentc5e632c11384b0bbf1881df1594ad54aa799406e
parent6cc36bd9e4d0b01488a38696fbf6a6e4819206b5
Merge remote-tracking branch 'origin/master'