Merge remote-tracking branch 'origin/master'
commit2b19bd55ace4b5014a0910de7838a109c36595ee
authorWeblate <noreply@weblate.org>
Tue, 9 Jun 2015 11:50:25 +0000 (9 13:50 +0200)
committerWeblate <noreply@weblate.org>
Tue, 9 Jun 2015 11:50:25 +0000 (9 13:50 +0200)
treea011ad5c955ab210a73643fb4ca940a1c416447b
parenta37b8fc79c3078716a228ece472558bdebeb1ec1
parent9e101a407d9ded90077c03e0bb86a4d05dfbe456
Merge remote-tracking branch 'origin/master'