Merge remote-tracking branch 'origin/master'
commit0f32c7ec15665cc485a3220b7cab4bf3acfa4b69
authorWeblate <noreply@weblate.org>
Mon, 20 Jul 2015 19:50:50 +0000 (20 21:50 +0200)
committerWeblate <noreply@weblate.org>
Mon, 20 Jul 2015 19:50:50 +0000 (20 21:50 +0200)
treefa49e92bc2d36706808f90b63aa8f8537fba7e9a
parent1d3941178a8d6e07ef566f8a36970072296c08d4
parentaa41a2b77c91d56b057f4608dd78d76aa7fad3ad
Merge remote-tracking branch 'origin/master'