Merge remote-tracking branch 'origin/master'
commit6e8221126fea177ce1c9f1615af6735f9f2fbb81
authorWeblate <noreply@weblate.org>
Wed, 2 Oct 2013 01:57:58 +0000 (2 03:57 +0200)
committerWeblate <noreply@weblate.org>
Wed, 2 Oct 2013 01:57:58 +0000 (2 03:57 +0200)
tree4cdbdb36b8548db5edd689dd6b3ab6811d998243
parent24ebd34a3141f893bb61d26a24f659f527d92911
parent3b2d624ce2d4cf577649d3dca62452e4fdcdbdc3
Merge remote-tracking branch 'origin/master'