Merge remote-tracking branch 'origin/master'
commit239ce5794171577a7a0cee5c42ff986da876178a
authorWeblate <noreply@weblate.org>
Mon, 29 Jul 2013 17:39:35 +0000 (29 19:39 +0200)
committerWeblate <noreply@weblate.org>
Mon, 29 Jul 2013 17:39:35 +0000 (29 19:39 +0200)
tree9284b21848923aa1371e03376af6c21f8a0abe7a
parent0d6f02d226a22da12119c16b9f43bde3ad19f21d
parenta9b7592c8da1b9060f22ab3a3f9835ca3069686d
Merge remote-tracking branch 'origin/master'