Merge remote-tracking branch 'origin/master'
commit3debe31abefe1df04284a22eafb2a0f85b7b593b
authorWeblate <noreply@weblate.org>
Sun, 25 Jan 2015 10:38:06 +0000 (25 11:38 +0100)
committerWeblate <noreply@weblate.org>
Sun, 25 Jan 2015 10:38:06 +0000 (25 11:38 +0100)
tree3934fac8362a52f50344558e0ee89c73d05ed3fe
parentfe35dbcc9bc9a4520609c42e97042a02ad7aadfb
parent41ab33863c73cccf0ef7ff391cb6e5e51d70f453
Merge remote-tracking branch 'origin/master'