Merge remote-tracking branch 'origin/master'
commit1362e91176e552dbdf0a14c9bdc774724b82ea56
authorWeblate <noreply@weblate.org>
Fri, 29 May 2015 11:27:02 +0000 (29 13:27 +0200)
committerWeblate <noreply@weblate.org>
Fri, 29 May 2015 11:27:02 +0000 (29 13:27 +0200)
tree53b7ef066ddba3470c23fe54e13827d77dc5b95d
parentca5a6f8681984ee2f46e42c11d2329075aa5dc2b
parentf0c272ce6e1ec06b6176a9caf3568fa410d07ac1
Merge remote-tracking branch 'origin/master'