Merge remote-tracking branch 'origin/master'
commit9a10222b42548b168f473684a0a530b923e540ef
authorWeblate <noreply@weblate.org>
Tue, 17 Mar 2015 20:03:40 +0000 (17 21:03 +0100)
committerWeblate <noreply@weblate.org>
Tue, 17 Mar 2015 20:03:40 +0000 (17 21:03 +0100)
treeaf6d566aadd1f778d3aed8beebefe90619f4b52d
parent3a9304883ff3c21b8899227e71aea63466871497
parentb84c08f4d41e6c5d298573b1c567cc3d8bbc4e98
Merge remote-tracking branch 'origin/master'