Merge remote-tracking branch 'origin/master'
commitc59d9c63ec8f2e5bfc1546368b2a548b7e293e7e
authorWeblate <noreply@weblate.org>
Wed, 28 Aug 2013 08:37:28 +0000 (28 10:37 +0200)
committerWeblate <noreply@weblate.org>
Wed, 28 Aug 2013 08:37:28 +0000 (28 10:37 +0200)
tree629689ad36add362085292e1ef5630ce41fab271
parent0a7295568301b2a96976187cf29d7b7d28c3a16b
parentceb35a88169caa501a0f5d3dc1d8e57110fad96f
Merge remote-tracking branch 'origin/master'