Merge remote-tracking branch 'origin/master'
commit5c67a009fb7f039e2daf79b7102f43e1b30cba64
authorWeblate <noreply@weblate.org>
Sat, 24 Aug 2013 10:29:55 +0000 (24 12:29 +0200)
committerWeblate <noreply@weblate.org>
Sat, 24 Aug 2013 10:29:55 +0000 (24 12:29 +0200)
treee917c6c5e5685d3bbf20c65b786372e3c805a041
parentbffc2355a608b6bd581d7fe7dafe425ee107e3dd
parent94a309b077fd67631daeaf55414ddbc4a5473fa8
Merge remote-tracking branch 'origin/master'