Merge remote-tracking branch 'origin/master'
commit536f8736d3212658d8b16b4365e5229c601c9566
authorWeblate <noreply@weblate.org>
Sat, 15 Jun 2013 11:18:20 +0000 (15 13:18 +0200)
committerWeblate <noreply@weblate.org>
Sat, 15 Jun 2013 11:18:20 +0000 (15 13:18 +0200)
tree719f36141407d0e34043b52e49e8888d338a8eae
parent680a60e4ed2c61f70421979fd34fbe30578dd81a
parent49cd5516f6cd0913ebaffc9ae129ed37ac5b5353
Merge remote-tracking branch 'origin/master'