Merge remote-tracking branch 'origin/master'
commita409ef782560c2b351a8b5cd593dedad2ef5a1a8
authorWeblate <noreply@weblate.org>
Fri, 16 Jan 2015 11:02:53 +0000 (16 12:02 +0100)
committerWeblate <noreply@weblate.org>
Fri, 16 Jan 2015 11:02:53 +0000 (16 12:02 +0100)
tree07637f8dd9874e358e9ca7e8cf7281a2808ad871
parent0c6051211847c1315b72dde580881b2024b101ed
parent6d56ef9c4d680c027347a26339d1c98caaf6c25b
Merge remote-tracking branch 'origin/master'