Merge remote-tracking branch 'origin/master'
commit72e9b4327c254f33f86927b5c7e9695238fb6d41
authorWeblate <noreply@weblate.org>
Sat, 6 Jul 2013 17:28:22 +0000 (6 19:28 +0200)
committerWeblate <noreply@weblate.org>
Sat, 6 Jul 2013 17:28:22 +0000 (6 19:28 +0200)
tree22577919dde2f358fba22d20bbc2fab5d2a2bdc9
parent7d41837b87b9aa4736aa01c75f8d2cf54f978eaf
parent430e43948f08d5cf77b696e9874713a32ced8981
Merge remote-tracking branch 'origin/master'