Merge remote-tracking branch 'origin/master'
commit6c2b535f10b80978253d56ad0a36121702000dfd
authorWeblate <noreply@weblate.org>
Fri, 31 Jul 2015 13:02:00 +0000 (31 15:02 +0200)
committerWeblate <noreply@weblate.org>
Fri, 31 Jul 2015 13:02:00 +0000 (31 15:02 +0200)
tree4934660a70268b8b9aa0432bce580e550443e513
parenta41d5b1a7ed38014832e2c1b098e3267225e08d1
parentf62fba7fc7c1de27f924c64c3d7e0071608870a5
Merge remote-tracking branch 'origin/master'