Merge remote-tracking branch 'origin/master'
commit5e3793cb66990a7239d98627f0ac916ee3a7c6aa
authorWeblate <noreply@weblate.org>
Tue, 11 Jun 2013 13:05:22 +0000 (11 15:05 +0200)
committerWeblate <noreply@weblate.org>
Tue, 11 Jun 2013 13:05:22 +0000 (11 15:05 +0200)
tree9016784b49a4bda643374c6b37df2f199e1493cb
parent4ccd55e0a789de8aef3b2f898dd71e0efd11a065
parent0f4e573b1e0bcb743334e4818102b428bd023d2e
Merge remote-tracking branch 'origin/master'