Merge remote-tracking branch 'alfh/feature_vnstat_1.11' into beyond-next

diff --combined config/rootfiles/common/vnstat
index 57c54dbef6d63c5c189eb2577091ce0e6567beb1,4ddec4a9ce31538d2f1c9361d74ddf9921123e43..faabf47e8ae2041df0c94028574718e7cd46f1f8
--- 1/config/rootfiles/common/vnstat
--- 2/config/rootfiles/common/vnstat
+++ b/config/rootfiles/common/vnstat
@@@ -2,5 -2,11 +2,10 @@@
  #etc/cron.d/vnstat
  etc/vnstat.conf
  usr/bin/vnstat
+ usr/bin/vnstati
+ #usr/sbin/vnstatd
+ #usr/share/man/man5/vnstat.conf.5
+ #usr/share/man/man1/vnstatd.1
+ #usr/share/man/man1/vnstati.1
  #usr/share/man/man1/vnstat.1
  #var/lib/vnstat
 -

diff --combined make.sh
index 61b07ffcf28338daa7e9506a32e2b0f4fae12264,20124b3549b2a9e8422e0f4cfdd300321844201e..554254ba53eda5e17dc13f5431698ea7513f5d29
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -25,7 -25,7 +25,7 @@@
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
  VERSION="2.15"                                                        # Version number
 -CORE="76-beta2"                                                       # Core Level (Filename)
 +CORE="76-beta3"                                                       # Core Level (Filename)
  PAKFIRE_CORE="76"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                  # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
@@@ -438,8 -438,6 +438,8 @@@ buildipfire() 
      # arm multi platform (Panda, Wandboard ...) kernel build
      ipfiremake linux                  KCFG="-multi"
      ipfiremake cryptodev              KCFG="-multi"
 +    ipfiremake e1000e                 KCFG="-multi"
 +    ipfiremake igb                    KCFG="-multi"
  
      # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
      ipfiremake linux                  KCFG="-kirkwood"
@@@ -450,8 -448,8 +450,8 @@@
  #    ipfiremake r8169                 KCFG="-kirkwood"
  #    ipfiremake r8168                 KCFG="-kirkwood"
  #    ipfiremake r8101                 KCFG="-kirkwood"
 -#   ipfiremake e1000e                 KCFG="-kirkwood"
 -#    ipfiremake igb                   KCFG="-kirkwood"
 +#    ipfiremake e1000e                        KCFG="-kirkwood"
 +    ipfiremake igb                    KCFG="-kirkwood"
  
    fi
    ipfiremake pkg-config
@@@ -681,8 -679,6 +681,8 @@@
    ipfiremake vdr_streamdev
    ipfiremake vdr_vnsiserver3
    ipfiremake vdr_epgsearch
 +  ipfiremake vdr_dvbapi
 +  ipfiremake vdr_eepg
    ipfiremake w_scan
    ipfiremake icecast
    ipfiremake icegenerator
@@@ -692,7 -688,6 +692,6 @@@
    ipfiremake git
    ipfiremake squidclamav
    ipfiremake vnstat
-   ipfiremake vnstati
    ipfiremake iw
    ipfiremake wpa_supplicant
    ipfiremake hostapd