Merge remote-tracking branch 'origin/master'
commit55ff5db9712fd9e7e09c815bdcbcfe491f03beb8
authorWeblate <noreply@weblate.org>
Sun, 22 Mar 2015 11:26:31 +0000 (22 12:26 +0100)
committerWeblate <noreply@weblate.org>
Sun, 22 Mar 2015 11:26:31 +0000 (22 12:26 +0100)
tree165944255fcf011a2988e7f607351ae9c9d37b1c
parent943dbdf3137387892796577b381083b35c390f8b
parenta6532471894c2415fcc807ffef2a6096404c3c52
Merge remote-tracking branch 'origin/master'