Merge remote-tracking branch 'origin/master'
commitc8aa5c6e5633c53ff757e985d7a80c3b5cd3d427
authorWeblate <noreply@weblate.org>
Fri, 4 Oct 2013 11:56:29 +0000 (4 13:56 +0200)
committerWeblate <noreply@weblate.org>
Fri, 4 Oct 2013 11:56:29 +0000 (4 13:56 +0200)
tree956d76697f7d6a7a93715776bd163fb430b11802
parentd5233e516965cd239cbf9f4fa9c23fe16bd18329
parent8a57dbf16ddcfe3f83bf5730d2054155394f0ed1
Merge remote-tracking branch 'origin/master'