Merge remote-tracking branch 'origin/master'
commit8c36cc867d6f27e3f253baaadf02981b6ccf29e6
authorWeblate <noreply@weblate.org>
Tue, 13 Jan 2015 21:44:43 +0000 (13 22:44 +0100)
committerWeblate <noreply@weblate.org>
Tue, 13 Jan 2015 21:44:43 +0000 (13 22:44 +0100)
tree3d661c4ecd7f08c967ebd3a9a44332af7d0e75f8
parentc40395c68512cde6d5fa2706e342dfdac68748b9
parent7053381719707ef8b0706a77d939b0063ba2d7c9
Merge remote-tracking branch 'origin/master'