Merge branch 'master' into trunk

augustuswm · Apr 15, 2015 · 0afb459 · 0afb459
2 parents 7e46e88 + a7fdb33
commit 0afb459
Show file tree

Hide file tree

Showing 2 changed files with 267 additions and 208 deletions.
diff --git a/languages/cmb2-pt_BR.mo b/languages/cmb2-pt_BR.mo