Merge remote-tracking branch 'origin/master'
commita97691f922ce15f792c1a3753e884757151c5cb5
authorWeblate <noreply@weblate.org>
Mon, 26 Jan 2015 11:44:27 +0000 (26 12:44 +0100)
committerWeblate <noreply@weblate.org>
Mon, 26 Jan 2015 11:44:27 +0000 (26 12:44 +0100)
treef1344c3129a9e48831d59c8a881cc06f16e56974
parentf29b12ecf042080ee37346a1ee2cabe29badc128
parent34cadf6aed4639a598c79f819ce038467b41e58a
Merge remote-tracking branch 'origin/master'