Merge remote-tracking branch 'origin/master'
commit73301d099ba34dc5aade8f578827b0709281d4d2
authorWeblate <noreply@weblate.org>
Mon, 21 Oct 2013 10:31:24 +0000 (21 12:31 +0200)
committerWeblate <noreply@weblate.org>
Mon, 21 Oct 2013 10:31:24 +0000 (21 12:31 +0200)
tree297bcd086ba726026801a46c8e9c5a2b0abcb7d2
parent19645b90584b4c6a22b975ab0325ee115138c9bc
parent11a9be49804b0884ef5ad3b3cef12ef74ee18e7c
Merge remote-tracking branch 'origin/master'