Merge remote-tracking branch 'origin/master'
commitaf0b7a3d37f86eab5ff7025a8406e44d7c6347c2
authorWeblate <noreply@weblate.org>
Wed, 2 Oct 2013 11:37:38 +0000 (2 13:37 +0200)
committerWeblate <noreply@weblate.org>
Wed, 2 Oct 2013 11:37:38 +0000 (2 13:37 +0200)
tree8b2fa5fd2e68bf180af385321ec819deaa409dbe
parent15ff074b1fc38336782a3dbada03022fcd419b8f
parent44eac82d0ead7897d8bba2f881c6d0c0bfcf9b97
Merge remote-tracking branch 'origin/master'