Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

diff --cc pkgs/mc/mc.nm
index 988cecbc44ca0e753244049e4ad746d50f4642a0,bec6d2e132bed53a2820d651b2e33e15c0d1df41..6625e4ab183f332b754cc57c53182d940f6e6aeb
--- 1/pkgs/mc/mc.nm
--- 2/pkgs/mc/mc.nm
+++ b/pkgs/mc/mc.nm
@@@ -26,10 -26,10 +26,10 @@@ include $(PKGROOT)/Includ
  
  PKG_NAME       = mc
  PKG_VER        = 4.7.4
 -PKG_REL        = 0
 +PKG_REL        = 1
  
  PKG_MAINTAINER =
- PKG_GROUP      = Applications/System
+ PKG_GROUPS     = Applications/System
  PKG_URL        = http://www.ibiblio.org/mc/
  PKG_LICENSE    = GPLv2+
  PKG_SUMMARY    = User-friendly text console file manager and visual shell.