Merge remote-tracking branch 'origin/master'
commit5bff4deabe3eb36073740c174da97a11c474d7fe
authorWeblate <noreply@weblate.org>
Tue, 30 Dec 2014 13:09:11 +0000 (30 14:09 +0100)
committerWeblate <noreply@weblate.org>
Tue, 30 Dec 2014 13:09:11 +0000 (30 14:09 +0100)
tree85a90d8d148353278ff155cd60ae6e6153cc0cbb
parent440a32edee8a2a2337866eedec3fe70e13fedd9a
parentf6a19c79cbb802fc8d8fa86fd4e7d26b59749afa
Merge remote-tracking branch 'origin/master'