Merge remote-tracking branch 'origin/master'
commit7148adcc0bbf445d1efde01d268f218ad0fd1267
authorWeblate <noreply@weblate.org>
Sat, 26 Oct 2013 11:51:48 +0000 (26 13:51 +0200)
committerWeblate <noreply@weblate.org>
Sat, 26 Oct 2013 11:51:48 +0000 (26 13:51 +0200)
treed9589b917fec216be4e68e045b6b63724ccc8305
parentbc440064f69efc6a92b468778105d8b67a310f7a
parentd8f7c1079e44514892423aa8e47d0e1e269e222b
Merge remote-tracking branch 'origin/master'