Merge branch 'master' into dev
tree: d330730e2952c5cccd4ba6acc684354d148e0c7c
  1. po/
  2. gitk
  3. Makefile