Merge remote-tracking branch 'origin/master'
commite10c2305411115dc76e0f50f53bd90da5151c168
authorWeblate <noreply@weblate.org>
Tue, 15 Oct 2013 09:59:17 +0000 (15 11:59 +0200)
committerWeblate <noreply@weblate.org>
Tue, 15 Oct 2013 09:59:17 +0000 (15 11:59 +0200)
tree336bd931b13fc5484c05bad4e2e9efcbbf1ce11a
parent6008484c68f7af8950a84e02081c638a2dcd103b
parentd4a7e6925047268528317fb9a0101725c96dbfc5
Merge remote-tracking branch 'origin/master'