Merge remote-tracking branch 'origin/master'
commit6f19afee894c6464ee00b872e1e26ef490e6834b
authorWeblate <noreply@weblate.org>
Wed, 7 Jan 2015 05:24:07 +0000 (7 06:24 +0100)
committerWeblate <noreply@weblate.org>
Wed, 7 Jan 2015 05:24:07 +0000 (7 06:24 +0100)
tree93cc63290613601da29ca85b9fd2a65890c314fa
parent29e7916faa434cdc6e8d5bb03acec25e4943273b
parent245e730f56af442838d45b4db8fd6a230f12133c
Merge remote-tracking branch 'origin/master'