Merge remote-tracking branch 'origin/master'
commitb25e716bc9ba42cc4cc1a467b4e68737771f13ae
authorWeblate <noreply@weblate.org>
Thu, 14 Jan 2016 01:49:15 +0000 (14 02:49 +0100)
committerWeblate <noreply@weblate.org>
Thu, 14 Jan 2016 01:49:15 +0000 (14 02:49 +0100)
tree3d44f50a52529377bd68491f5f82097cb60772ac
parentc79858106b71078c3f3a16419d92cd8db8b990a3
parent126d7b125e5d57c8c9e24c77b4436cf8d7d398bd
Merge remote-tracking branch 'origin/master'