Merge remote-tracking branch 'origin/master'
commitef1aacce489232a3932a6f6c9304a4f0a2ccffc4
authorWeblate <noreply@weblate.org>
Tue, 25 Jun 2013 10:41:07 +0000 (25 12:41 +0200)
committerWeblate <noreply@weblate.org>
Tue, 25 Jun 2013 10:41:07 +0000 (25 12:41 +0200)
treeda297c85a54786c260e0935c4b8a2b02c08e97f5
parent1b5611bc5481e3a96d006d65990b53ba14c8f244
parent1ba48eef2ae03d12b98919c6c2bd0782c8b5cae5
Merge remote-tracking branch 'origin/master'